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

Change-Id: I5fdd7ad01021fe0670bfb58b83bc6f42e97768f2