cm: Remove procmem and procrank from user builds

 * These need to be installed setuid, which is a no-no for CTS.

Change-Id: I68d111db2db675116e214108776aa13c848d0c9a

Put procmem and procrank back into non-user builds

Change-Id: I193a9607dad40043649de6fea1f9bf0ab0c437f1
diff --git a/config/common.mk b/config/common.mk
index 3ef85d3..9ccd63c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -187,8 +187,6 @@
     gdbserver \
     micro_bench \
     oprofiled \
-    procmem \
-    procrank \
     sqlite3 \
     strace
 
@@ -210,6 +208,8 @@
 ifneq ($(TARGET_BUILD_VARIANT),user)
 
 PRODUCT_PACKAGES += \
+    procmem \
+    procrank \
     CMUpdater \
     Superuser \
     su