Merge "Revert "Add Trim Path API demo.""