tree 8f0f5674ed2ded8e6460e5965fd70ec447fbbd63
parent bc37b37225e50e94011038f4eeae700c82cb3d02
parent dd361376bd769581b0fd991e081fb376cee69cb2
author Elliott Hughes <enh@google.com> 1575318198 -0800
committer android-build-merger <android-build-merger@google.com> 1575318198 -0800

Merge "Sync with upstream OpenBSD strstr()." am: 9416e02757 am: b3c1c0a813
am: dd361376bd

Change-Id: If2dd6d33ff0950a299c2b3efb56c637a10449a0f