Merge "Revert "Track strerror(3) change."" am: cc4244fadf am: 7db97a6e96 am: 779a9a6ab7

Original change: https://android-review.googlesource.com/c/platform/system/libbase/+/1847497

Change-Id: Ie08098efbc83abe557a9c8cc82f7b92d68f964ed