Merge "Sync with upstream NetBSD." am: 0cfe54966b

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

Change-Id: I7cd5c8bb80302085f03448b0ce81cda880949000