Merge "Fix logic problems in AnimationDrawable and View."