Merge "Remove skip_jarjar_repackage" into main