Merge "Add adb integration test to general-tests"
am: 7b1d163cb8

Change-Id: I5fc70e76edff1c8924a54e3128733d2b7fcfb20d