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

Change-Id: I9a3e85f2223d6b6e520056fb156b9158a277d41e