Merge "WIP: 4x4 idct/recon merge" into experimental

diff --cc vp9/common/vp9_blockd.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