Merge "Revert "Create v4 PathInterpolatorCompat"" into lmp-mr1-ub-dev