Merge "Remove mips." am: ba4d743a16

Change-Id: Ibb623e2bd173a7ccdab11b96431c8c3a9c07677d