am 41143be8: Merge "adb: Don\'t clobber block devices during push"

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