Merge "Pass sampling to SkImageFilters factory" into sc-dev