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

* commit '2b16fc99cff925d55400d467fe9bc2749a4feb4d':
  adb: add tests for pushing/pulling empty dirs.