am f46cf902: am 3a7a4696: Merge "Replace "mips" with "mipmaps" since the MIPS gcc compiler defines mips to 1."

* commit 'f46cf902b137a8ac7d67e74ed678a0d497ffff2e':
  Replace "mips" with "mipmaps" since the MIPS gcc compiler defines mips to 1.