Merge kwd to master

Change-Id: Id33008507cbafc88288b6483c7691d6db34cc5c3
diff --git a/rild/Android.mk b/rild/Android.mk
index 1f616b1..151cda6 100644
--- a/rild/Android.mk
+++ b/rild/Android.mk
@@ -18,6 +18,11 @@
 	librilutils_static
 
 LOCAL_CFLAGS := -DRIL_SHLIB
+#LOCAL_CFLAGS += -DANDROID_MULTI_SIM
+
+ifeq ($(SIM_COUNT), 2)
+    LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2
+endif
 
 LOCAL_MODULE:= rild
 LOCAL_MODULE_TAGS := optional