Merge "adb unittest: make test_sync properly cleanup after itself"