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

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