Merge "Speed up adb sync."