Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."