Merge "Infer value type for ObjectAnimator, too" into mnc-dev