am c583c511: am 186f1dee: Merge "adb sync cleanup."

* commit 'c583c5112bb6634114cd9759c1cfbad61a13b397':
  adb sync cleanup.