am debb3f8c: am b1259ffd: (-s ours) am f298f6be: Merge "Use errno correctly."

* commit 'debb3f8cba49db2dff687a5758aebdbbd99b6393':