Merge "Sync with upstream OpenBSD." am: 907e0aebd2

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1383503

Change-Id: Ic6f77a1ffe6c8fa2ccc0c9af2072829d81f791e8