Merge "Revert "Temporary workaround to prevent automated jarjar renaming.""