Merge "Rename unique_fd::clear to unique_fd::reset."
am: f9f04003f5

Change-Id: I856ff1bdb5735a90e3b6c13d2f7a2deeff0388e0