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

Change-Id: Ia29af9266e7bccb8865756ab974f7c591daca825