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

Change-Id: I6b0ea4e02aac760830b0440ff21c6c610464e3b7