Merge "Merging the hybrid transform experiments" into experimental

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

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

diff --cc vp8/encoder/encodeintra.c
Simple merge

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/encoder/onyx_int.h
Simple merge

diff --cc vp8/encoder/rdopt.c
Simple merge