Merge "Fix adb_py module."