fix possible revert going from mfx to google.

Change-Id: Ica27ee99198f5e021e7e27e19387a67b432247e0
Merge branch 'cm-10.1' into martincz