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