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

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