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

This reverts commit aae2e51f245328652c00c95004f394ff360e2fb8.

Split the support library out of core-tests so the frameworks tests
don't go over the method limit.

Change-Id: Ib177a41b9965f213d325964e9723bfdfba2c5b99
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1618f1b..992b0dc 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -45,6 +45,8 @@
 #$(call add-clean-step, find $(OUT) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 #$(call add-clean-step, rm -rf $(OUT)/obj/SHARED_LIBRARIES/libdvm*)
+$(call add-clean-step, rm -rf $(OUT)/system/framework/conscrypt-nojarjar.jar)
+$(call add-clean-step, rm -rf $(OUT)/system/framework/conscrypt-nojarjar.jar)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************