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

* commit '06e6ccb98ab7b557e98a41af562ca515714e776a':