Revert "Revert "Use NetworkStack as mainline target w/ stable API""

This reverts commit dc19816134caefa6057b1097276f433cdbe843ba.

Reason for revert: roll forward after fixing tests in b/144168912

Change-Id: Idc3d306be56f2e322cab9802bb6b418fa40bffef
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 43a1bd0..6c79f20 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -45,6 +45,8 @@
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CaptivePortalLogin)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/NetworkStack)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/NetworkStackApiStable)
 
 # ******************************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER