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

* commit 'b135f6e58cc81a6de64c55017d25496003ebe547':
  Remove the unused arch-x86 and arch-x86-64 kernel headers.