Merge "Fix ValueAnimator.getCurrentPlayTime()"