Merge "Merge all various transform size data trackers into single variables." into...

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

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

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

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

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