Merge "adb: convert more stuff to unique_fd."
am: 79f60a9bab

Change-Id: I3633efe24d2b337adca2ad39347faa7d1772a100