Merge changes I93514d22,I57dbc113,I707ffbd1
am: aa7c37522a

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