Merge "Add adb integration test to general-tests"