Merge "adb: update tests for push/pull directory change." am: 95e0260252
am: 7a2b0f3221

* commit '7a2b0f3221afe330df98d1a87a7040caca6dc82c':
  adb: update tests for push/pull directory change.