Merge "adb: fix infinite loop when attempting to push to //foo."