am bfe3cf51: Merge "Speed up adb sync."

* commit 'bfe3cf51857b47e59b246ce149cc1bb36fea9754':
  Speed up adb sync.