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

Change-Id: Ica8691bfa5ff84dabe9e026dfae46e8093cf4fb4