Merge "Convert colorpicker to aapt2."
diff --git a/Android.mk b/Android.mk
index 279c43a..c369285 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,4 +21,5 @@
      $(call all-java-files-under, src) \
      $(call all-logtags-files-under, src)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_USE_AAPT2 := true
 include $(BUILD_STATIC_JAVA_LIBRARY)