Moving colorpicker items into its own library.

Change-Id: Ib27e42df737b0dfd3946e0550dcd28a1576b8f24
diff --git a/Android.mk b/Android.mk
index 1147f05..b9c730c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,9 @@
 
 # Include res dir from chips
 chips_dir := ../../../frameworks/ex/chips/res
-res_dirs := $(chips_dir) res
+color_picker_dir := ../../../frameworks/opt/colorpicker/res
+
+res_dirs := $(chips_dir) $(color_picker_dir) res
 src_dirs := src
 
 LOCAL_EMMA_COVERAGE_FILTER := +com.android.calendar.*
@@ -22,6 +24,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES := \
 		android-common \
 		android-common-chips \
+		colorpicker \
 		android-support-v4 \
 		calendar-common
 
@@ -35,6 +38,7 @@
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips
+LOCAL_AAPT_FLAGS += --extra-packages com.android.colorpicker
 
 include $(BUILD_PACKAGE)