Merge "Fix test_adb.py against production builds."