Merge "adb: don't use parameterized in test_adb.py."