Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp

* changes:
  Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev am: 65dfc2a3e5
  Fix NPE in ValueAnimator am: 543a7ed7af

core/java/android/animation/ObjectAnimator.java

@@ -977,7 +977,7 @@ public final class ObjectAnimator extends ValueAnimator {
     @Override
     void animateValue(float fraction) {
         final Object target = getTarget();
-        if (mTarget != null && target == null) {
+        if (target == null) {
             // We lost the target reference, cancel and clean up.
             cancel();
             return;

core/java/android/animation/ValueAnimator.java

@@ -982,6 +982,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio
         mStarted = true;
         mPaused = false;
         mRunning = false;
+        mAnimationEndRequested = false;
         // Resets mLastFrameTime when start() is called, so that if the animation was running,
         // calling start() would put the animation in the
         // started-but-not-yet-reached-the-first-frame phase.