Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev