am c65ad165: Merge "Fix "error: \'strerror\' was not declared in this scope"."