Merge "Add "entropy" experiment" into nextgenv2

diff --cc vp10/common/onyxc_int.h
Simple merge

diff --cc vp10/decoder/decodeframe.c
Simple merge

diff --cc vp10/encoder/bitstream.c
Simple merge

diff --cc vp10/encoder/encodeframe.c
Simple merge

diff --cc vp10/encoder/encoder.h
Simple merge

diff --cc vp10/encoder/rd.c
Simple merge

diff --cc vp10/encoder/rd.h
Simple merge

diff --cc vp10/encoder/tokenize.c
Simple merge