Merge "Fix broken tests in android.animation." into lmp-dev