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

Change-Id: I53278a094a4d96f9bcb32faa311e560728f76e10