Merge "Revert "Revert "Change conscrypt-nojarjar to a static library"""