Merge "Always use strerror to report errno."