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

Change-Id: I7cb20262996d803f5b2584d155c5d1ff725c40cc