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

Change-Id: Ib81e9e180570232ec823589ec421f5d6e0ff6c13