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

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