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

* commit '9c15d11156d60e1721dd8e1b3c018b4f0d9a00b0':
  Enable uapi kernel headers for arm.