GitLab

This commit makes the motion-var support cb4x4 mode. It resolves
the encoding failure issue when both experiments are enabled.

BUG=aomedia:136

Change-Id: I2fa963d62cbdd24cc54d5a95d02f2dc226e6d2d0