Merge "invoke macro removal encodemb" into experimental

diff --cc vp8/common/blockd.h
Simple merge

diff --cc vp8/common/rtcd_defs.sh
Simple merge

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

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

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