Use AAPT2 am: cc08604e68
am: 22e301a603

Change-Id: Id2301b7c4afec34b26b6cfe69c0cd2977d4bef16
diff --git a/Android.mk b/Android.mk
index 6b9ae19..2c6dda6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,10 @@
 LOCAL_CERTIFICATE := shared
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-common android-support-v4 jsr305
+        android-common jsr305
+LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4
+
+LOCAL_USE_AAPT2 := true
 
 # Include all the resources regardless of system supported locales
 LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true