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

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

Change-Id: Ibd35c989eaa055c8bdfcc642e68010615b517779