am 57ccde5f: am 7e7300ba: am 971f7a93: Merge "Revert "Add Trim Path API demo.""

* commit '57ccde5f0322c4465c28fa87bfcee03d894d26bd':