tree 6c7b5817d10ab34afb5a9633de547164b16efe87
parent 2807547c85cccebfdc48a5fa9a5c4525317a570b
parent 1ef56ca76324499c8a43e2729ce79a0b08041545
author Elliott Hughes <enh@google.com> 1572457354 -0700
committer android-build-merger <android-build-merger@google.com> 1572457354 -0700

Merge "Clean up some obsolete OpenBSD portability cruft." am: 80c99e30c0
am: 1ef56ca763

Change-Id: I20c47f92a7311598c76b7856d9664ffda03459da