Add messageformat to build files (gradle and make)

This enables clock to make use of ICU style message formatting.

Change-Id: Ia5c09fc9e078d1061d578761d903e3621971c723
diff --git a/Android.mk b/Android.mk
index 313b1cb..e459906 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,6 +25,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker
+LOCAL_STATIC_JAVA_LIBRARIES += messageformat
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-design
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
@@ -37,5 +38,6 @@
 LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout
 LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview
 LOCAL_AAPT_FLAGS += --extra-packages com.android.datetimepicker
+LOCAL_AAPT_FLAGS += --extra-packages com.android.messageformat
 
 include $(BUILD_PACKAGE)
diff --git a/build.gradle b/build.gradle
index 22609df..aa37742 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,7 @@
         compile (project(":android-opt-datetimepicker")) {
             exclude module: "support-v4"
         }
+        compile project(":messageformat")
         compile project(":support-design")
         compile project(":support-v7-appcompat")
         compile project(":support-v7-gridlayout")