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

Change-Id: Ibb8d8f3a1f5223e4130c15a194676722d50522b9