Merge "Fix adb.py."