Revert "Fix mips and mips64 builds." am: 98a90189db
am: ba19c01cab

Change-Id: Idc19b78ea30622b4230b921ff02635951de9b879