Merge "adb: add tests for pushing/pulling empty dirs." am: 084d084bbc am: 2b16fc99cf
am: 4147015c77

* commit '4147015c77362a9880e66078752d576d28da1a57':
  adb: add tests for pushing/pulling empty dirs.