Merge "Removing inv_txm4x4_1_add and inv_txm4x4_add function pointers."

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

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

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

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

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