Merge "Implement AnimatedImageDrawable.getColorFilter"