Merge "Cleaning up encoder segmentation code." into experimental

diff --cc vp9/common/vp9_blockd.h
Simple merge

diff --cc vp9/encoder/vp9_bitstream.c
Simple merge

diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
Simple merge

diff --cc vp9/encoder/vp9_segmentation.c
Simple merge