am ad6996a6: am 34cf868b: Merge "Point to the uapi header location for aarch64."

* commit 'ad6996a611c0af563edcb352828d3bd55cf85585':
  Point to the uapi header location for aarch64.