Merge "Renaming constants."

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

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

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

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

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

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

diff --cc vp9/encoder/vp9_onyx_int.h
Simple merge

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