am 930f4b12: am 2babe409: am bfd1ec82: Merge "Use updated uapi headers for aarch64."

* commit '930f4b12858c1dd256b8ddafb65226710431b661':
  Use updated uapi headers for aarch64.