Merge "strerror: add missing ERFKILL and EHWPOISON."
am: ecf0c7515d

Change-Id: I1ca2952dcbedddd42377157cdafa26c9f34109e6