Merge "adb: update tests for push/pull directory change."