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

* commit '09a0d98bebce23f014ea11af002c1fafaf6b8065':
  adb unittest: make test_sync properly cleanup after itself