am dffdd5eb: am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."

* commit 'dffdd5eb6d366b2f35ec87f20f91207e3b4657c3':