Merge "Renaming COMPPREDMODE_TYPE enum and its members."

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

diff --cc vp9/decoder/vp9_decodemv.c
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_int.h
Simple merge

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