Merge "Change conscrypt-nojarjar to a static library"