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

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