am 1d758c90: Merge "adb unittest: make test_sync properly cleanup after itself"

* commit '1d758c90959225c76ed4d318290ad1bf11532409':
  adb unittest: make test_sync properly cleanup after itself