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

Change-Id: Ie664fd18862e404845b2702ff546719818190cd1