Merge "adb: work around adbd push bug."
am: 3eb5d77913

Change-Id: Icd6d88c26322c5bc4b18bfb1848b8dce98c4dd91