Merge "Remove obsolete code from AnimatedRotateDrawable state"