Merge IMS changes from klp-wireless-dev to master

Change-Id: I247fa2b0e3aa159a27d96951edb0b04afd4d5ec6
diff --git a/Android.mk b/Android.mk
index 17c748a..75c81ac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,7 +9,7 @@
 src_dirs := src $(phone_common_dir)/src
 res_dirs := res $(phone_common_dir)/res
 
-LOCAL_JAVA_LIBRARIES := telephony-common voip-common
+LOCAL_JAVA_LIBRARIES := telephony-common voip-common ims-common
 LOCAL_STATIC_JAVA_LIBRARIES := \
         com.android.services.telephony.common \
         guava \