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

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