[automerger skipped] Merge "Remove mips." am: ba4d743a16 am: 6d5e141cc0 -s ours

am skip reason: Change-Id Ifac6515bb84c8da2faf53ef310caec7adff3f234 with SHA-1 316be1d908 is in history

Change-Id: I5538af0199f4903fffb805cc67f7a8d84f35b8d2