Merge "Convert opens to use unique_fd." am: ff93b794b5
am: 906709aa75

Change-Id: I1cd9d50e70e7bad328eee0a30da7e546c2781ab6