Merge "Use updated uapi headers for aarch64."