Merge kwd to master

Change-Id: Id33008507cbafc88288b6483c7691d6db34cc5c3
diff --git a/libril/Android.mk b/libril/Android.mk
index f8c070c..30731e9 100644
--- a/libril/Android.mk
+++ b/libril/Android.mk
@@ -15,7 +15,11 @@
     libhardware_legacy \
     librilutils
 
-LOCAL_CFLAGS :=
+#LOCAL_CFLAGS := -DANDROID_MULTI_SIM -DDSDA_RILD1
+
+ifeq ($(SIM_COUNT), 2)
+    LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2
+endif
 
 LOCAL_MODULE:= libril