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

* commit '3e6c3935e1cc58f41f269cf2c29bafa8cc718ebe':
  adb: update tests for push/pull directory change.