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

Change-Id: I0068f30953483c54997f9b8cd6b1c4081b2d7b78