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

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

Change-Id: If7f097a1ab76c01e4884b16f0318184479b2dc92