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

* commit '2babe4093578d15356ce9e0da62fff09f78f6f77':
  Use updated uapi headers for aarch64.