Merge "fix strerror_r test"