Bug: N/A Test: builds Change-Id: I89ad00e1c4c7e0767bc80a7ac7935a4d55e090ac
Test: m adb_integration_test_adb adb_integration_test_device Change-Id: I8c97af44ecf65eeae8a8dd678c43ad1d9f6c8a51