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

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

Change-Id: I56c04bfaa232e027589364bcc61d153f1fd5d821