Merge "Reduced size of animation drawables." into oc-mr1-dev
am: c592a0f824

Change-Id: I3860146e6167e22af48cce2dda502681c12e50c0