Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58
diff --git a/mini_common.mk b/mini_common.mk
index 5ee22be..9731c7e 100644
--- a/mini_common.mk
+++ b/mini_common.mk
@@ -38,7 +38,6 @@
     TestingCamera \
     WAPPushManager \
     audio \
-    audio_policy.default \
     audio.primary.default \
     com.android.future.usb.accessory \
     hostapd \