Merge "Make ViewAnimationUtils final"