Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."