Merge "adb: fix infinite loop when attempting to push to //foo." am: 070c030289 am: 971ac82dc4 am: 67c4491909
am: bda79a035d

Change-Id: I78041320ab9b04cf27add5d4f3560d3fd4551c4f