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

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

Change-Id: I4de2c9ee5b784d7a495456ada4c1bb79c1e83eef