Merge "Add strace back onto userdebug builds"
diff --git a/target/product/base.mk b/target/product/base.mk
index 0e3647d..a182f18 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -150,7 +150,8 @@
 PRODUCT_PACKAGES_DEBUG := \
     logpersist.start \
     perfprofd \
-    sqlite3
+    sqlite3 \
+    strace
 
 PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\
     frameworks/base/config/preloaded-classes:system/etc/preloaded-classes)