Merge changes from topic \'adb_dir\'
am: bf666599b3

* commit 'bf666599b32ec668f009076b594cccdd338e3cc5':
  adb: don't explode directories when pushing/pulling.
  adb: improve error handling, comments.