Merge "Moving itxm_add pointer from MACROBLOCKD to MACROBLOCK."