Merge "Fix ValueAnimator tests"