Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881  -s ours am: e11f92cdb3
am: 636552bdad

Change-Id: I765ef6356be0939f8c0858f07d3c4e252c254742
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 26a661d..5ad63b8 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -127,7 +127,8 @@
         v17/preference-leanback \
         documents-archive \
         customtabs \
-        exifinterface
+        exifinterface \
+        dynamic-animation
 
 #
 # A list of all source roots under frameworks/multidex.