Merge "Update AnimatedStateListDrawable to work with Animatable drawables"