Merge "Rename unique_fd::clear to unique_fd::reset." am: f9f04003f5 am: 44bd6ca0d0 am: d1a3db64c5
am: ebbfaf3fa3

Change-Id: I85eda7ff3e72efefc378770276a6ba8db651b252