Merge "Fix ConcurrentModificationException in AnimatorSet."