Merge "Allow mips to build."
am: 7009a3ccf7

Change-Id: I4564b2298e16258ccfe49f6651b751af35139f5f