Merge "adb: hopefully deflake test_adb.py."