Merge changes I93514d22,I57dbc113,I707ffbd1 am: 1cd680ce75 am: 6aafa03c60
am: 3bb90a6acd

* commit '3bb90a6acd50e1ebbd5ef06755e6afcfb181f5f8':
  adb: wait for restore to complete before returning.
  adb: wait for adbd to die and respawn in root/unroot.
  adb: make ScopedFd universally accessible and useful.