Cheryr-pick of 424de177

"resolved conflicts for merge of 0f085e5a to gingerbread-plus-aosp"

Change-Id: If2932eeb7a6f0420edf52ac343901afd68ce11fa
diff --git a/target/product/core.mk b/target/product/core.mk
index a4f8318..7e295be 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -41,6 +41,7 @@
     framework-res \
     hprof-conv \
     icu.dat \
+    ip-up-vpn \
     jasmin \
     jasmin.jar \
     libcrypto \