Merge "Allow mips to build." am: 7009a3ccf7 am: 3b6bbb8178 am: fa700068f8 am: 86ee45499d
am: f403575209

Change-Id: Idb565f45cb69206f3b90dc3f878041611e9dca8b