Merge "Fix ARM related issues in userfaultfd selftest"