am f89ee85b: Merge "Fix mips/mips64 headers"

* commit 'f89ee85b72942bbe9c3f7d3721fb9ce99cf7a7d7':
  Fix mips/mips64 headers