Merge "Remove flakey ObjectAnimatorTest" into jb-dev