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