am beea8a77: am 270ebefc: am b2c34ece: Merge "adb: Don\'t clobber block devices during push"

* commit 'beea8a77a1ee191346302315659b7914eefe0d8e':
  adb: Don't clobber block devices during push