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

* commit 'b1259ffd92f8965521f3f934548936dfd7650262':