Merge "[MIPS64] Adjust kernel/tools for mips32,mips64 headers"