Merge "Track strerror(3) change." am: 3a9d577990 am: 8e1c59bf2a

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

Change-Id: I5869f2b4c243d264253bebcff5398dc511fbbbcb