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

Change-Id: I0fe5981c030c8c1e1931a3f418135f63dd198d1a