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

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

Change-Id: Ia9b447313185b6d24aaef4b95d597c40d048f285