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

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