am 5fb7c74a: am 7bda5aac: am d12ee620: Merge "Re-enable uapi kernel headers for arm."

* commit '5fb7c74aeb072d56ba41897f5a7fe49394775df9':
  Re-enable uapi kernel headers for arm.