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

Change-Id: I0300878cbdf9677c84970430e50d1e97c324fa0f