Merge "Refactor ValueAnimator to reduce use of ThreadLocals."