Merge "strerror: incl enum name" am: 79de514910 am: 3afebabf1b

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

Change-Id: I5c7ab55a7a175c4c763685ae1905bc2c6ae20db9