tree 898c04a84c3a394e7a3361fdd0a3ccf18aa6f6bc
parent b66f6b2bd84a86448a6d3ac93a248768a98ed40e
parent f22d91173418fbfa21e1653e8ffd706f491473a9
author Elliott Hughes <enh@google.com> 1572454618 -0700
committer android-build-merger <android-build-merger@google.com> 1572454618 -0700

Merge "Clean up some obsolete FreeBSD portability cruft." am: 5951fcbd3f
am: f22d911734

Change-Id: I2e55d7c44ef8c06a3bb6364f8399e21d3d1dc354