am a20e67b5: am 1fa69e47: Merge "Don\'t use errno directly"

* commit 'a20e67b5abc7f6e8292cd46190b983eff2ee5352':
  Don't use errno directly