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

Change-Id: Ic69dcb4d1c499dc8e4daffb13435f5f22dd1e030