Merge "Consistent names for inter mode probabilities and encodings."

diff --cc vp9/common/vp9_entropymode.c
Simple merge

diff --cc vp9/common/vp9_entropymode.h
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_rdopt.c
Simple merge