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

Change-Id: Idcc204ec11678a21da285da73e9bc3bd8d9b6bb5