Merge "emulator: use puresoftware keymaster" into pi-dev
diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk
index e3f2db2..b7179d6 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -22,7 +22,6 @@
 	CustomLocale \
 	Development \
 	Dialer \
-	EmulatorSmokeTests \
 	Gallery2 \
 	Launcher3 \
 	Camera2 \