am d29c9fc1: am b59e358b: Merge "fix strerror_r test"

* commit 'd29c9fc18860a41f59d390b4aab937b61dd63ea1':
  fix strerror_r test