Merge "Add adb_integration_test_device to general-tests"