Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev