am b59e358b: Merge "fix strerror_r test"

* commit 'b59e358bb902124cc7d648266a97f96beefc8142':
  fix strerror_r test