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

* commit 'bfd1ec82b44bb90a327202aafa620523aed6307b':
  Use updated uapi headers for aarch64.