Merge "Fix incorrect anonymous AnimatorListenerAdapter."