am 8a69e031: Merge "Speed up adb sync."

* commit '8a69e0315a3288ca14213602f5bec1173bc3216e':
  Speed up adb sync.