am 8057b81e: am 09a0d98b: am 1d758c90: Merge "adb unittest: make test_sync properly cleanup after itself"

* commit '8057b81e22a1d0bfedaaa4687e06148b683b2ba2':
  adb unittest: make test_sync properly cleanup after itself