am b15ef843: am d69a1c50: Merge "Always use strerror to report errno."

* commit 'b15ef843e5ff929a902f2da21dba0b3eb088ff2e':
  Always use strerror to report errno.