Merge "SkQP: fix Filterable.filter" into android10-tests-dev