Merge "Remove generics from Animator APIs"