am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes."

* commit '1a8697f91c7f95477e5e1de4580d5b9e5ea3e6fd':
  Patch android-21 with aarch64 <sys/user.h> fixes.