Merge "Revert "Add jarjar_prefix to framework-minus-apex"" into main