am bc7064b5: am 7f36451b: am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""

* commit 'bc7064b5069955a271e56caa28ebc605140d0ca3':
  Revert "Enable uapi kernel headers for arm."