CHERRY-PICK: Extend host glibc workaround to userfaultfd am: 50257f14c9 am: e5292e55b4 am: e3cd66aeb6

Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470183

Change-Id: Ibce7c799ebf9ec3329eeef5ef59c53e80938ef03
Signed-off-by: Automerger Merge Worker <[email protected]>