Snap for 4593582 from 01bc56028fc375fadf0ce1b6a1b586bb3bbd8c84 to pi-release

Change-Id: Icdeb1d5e76a590eb1a2a3b978e967b9bec246a03
diff --git a/Android.mk b/Android.mk
index 55d68b5..18fa610 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,7 +29,7 @@
     android-support-v7-preference \
     android-support-v7-recyclerview \
     android-support-v4 \
-    android-support-design \
+    $(ANDROID_SUPPORT_DESIGN_TARGETS) \
     android-support-transition
 
 LOCAL_USE_AAPT2 := true