Merge "Revert "New mode_info_context storage""

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

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

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

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