Merge changes I93514d22,I57dbc113,I707ffbd1
am: 1cd680ce75

* commit '1cd680ce759effd33602de82197790fb027c1721':
  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.