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

Change-Id: I439324c692f96e63e86d06b2e3fa44c741cc13f8