Merge "Kill adb\'s ScopedFd for unique_fd." am: 0f3fde210d am: b8901de2ad
am: 8d96370fb2

* commit '8d96370fb2e13afc53d00f64822065b9da257110':
  Kill adb's ScopedFd for unique_fd.

Change-Id: I636d6fc5b7d591df3c3e769e4c75363f9e491f05