am 84b99aad: Merge "Enable uapi kernel headers for arm."

* commit '84b99aadddf3cd9d02a60b43923ed11fc7341c9f':
  Enable uapi kernel headers for arm.