Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809  -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: a8cd228fc7
am: 5b6859d20d

Change-Id: Id64c803bc5a4e8ee31a8b5821522694bd00c3c5e
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.