diff --git a/config/common.mk b/config/common.mk
index 13b31780..bc5943a9 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -171,7 +171,6 @@ PRODUCT_PACKAGES += \
     nano \
     htop \
     powertop \
-    lsof \
     mkfs.f2fs \
     fsck.f2fs \
     fibmap.f2fs \
@@ -182,7 +181,8 @@ PRODUCT_PACKAGES += \
     micro_bench \
     oprofiled \
     sqlite3 \
-    strace
+    strace \
+    pigz
 
 WITH_EXFAT ?= true
 ifeq ($(WITH_EXFAT),true)
diff --git a/config/common_full.mk b/config/common_full.mk
index 3ddb7db3..d3e834a5 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -19,7 +19,8 @@ PRODUCT_PACKAGES += \
 
 # Extra tools in CM
 PRODUCT_PACKAGES += \
-    vim \
-    zip \
+    bzip2 \
+    curl \
     unrar \
-    curl
+    vim \
+    zip