Fix mips and mips64 builds. am: b5b70be878 am: d5c7919713
am: 284ad60ac7

Change-Id: I7c531d14ea11942548afd3ed548228b2cad2b3af