tree ab9caa48a0d00336cea4130fc32d35d031869066
parent 3a61ac108216fab4a15bc610f71d7651fc2a5786
parent 1a16af79e5b20103cf29ff2af11bcf7e1a3e1575
author Elliott Hughes <enh@google.com> 1574304755 -0800
committer android-build-merger <android-build-merger@google.com> 1574304755 -0800

Merge "Take a bunch of trivial patches from upstream OpenBSD." am: feb88ff424
am: 1a16af79e5

Change-Id: Icf83e9d9e5e9f0e6d5774c7f511e3eb0cd48662d