Merge "Revert "Fix retrofit OTA generation failures"" into main

      relative_path = path.removeprefix(input_dir).removeprefix("/")

      if not Fnmatch(relative_path, UNZIP_PATTERN):

        continue

      if filename.endswith(".prop") or filename == "prop.default" or "/etc/vintf/" in relative_path:

        target_path = os.path.join(

            output_dir, relative_path)

        os.makedirs(os.path.dirname(target_path), exist_ok=True)