Merge changes from topic 'adb_dir'

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