Merge "Add auto-cancel ability to ObjectAnimator" into jb-mr2-dev