Merge "Fix mips/mips64 headers"