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

Change-Id: I3ef056663665ac78a7a0b8910c6a7fc63e861b89