am cefe8d21: am f89ee85b: Merge "Fix mips/mips64 headers"

* commit 'cefe8d21f311611e20263caf72349ebb10f81df1':
  Fix mips/mips64 headers