am 7f50a9df: Merge "Fix "error: use of undeclared identifier \'strerror\'"."