Merge "Reusing {above, left}_seg_context vars in both encoder and decoder."

diff --cc vp9/decoder/vp9_decodeframe.c
Simple merge

diff --cc vp9/decoder/vp9_decoder.c
Simple merge

diff --cc vp9/decoder/vp9_decoder.h
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_onyx_int.h
Simple merge