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

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