Merge "Fix update_prebuilts.py support for local zip"