Merge "Add adb_integration_test_device to general-tests" am: 42a2e9eb27 am: dfd0db42f6
am: ac37262366

Change-Id: I24f3fe6529c672ae33753d9ebaacb54005d77ee0