Merge "adb: convert more stuff to unique_fd."