Merge "Fix ARM related issues in userfaultfd selftest" am: 47966bd9bc am: 58e18f9e6c am: 92ee68ac87

Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/1744558

Change-Id: I84faf5b86d385c7250229adab31b1713e0fcc02c