Merge "Revert "strerror: incl enum name"" am: 2e1e76b8ff am: 8a258bb4b9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1847496

Change-Id: I544aad15b59bbb9fadffa0c54cf8adbca8cd1cdf