Merge "don't leak test filters and shaders" into master-skia

https://skia.googlesource.com/skia/+/57fa241d6f43557e4243a46f8b5a4ed447ccb8d2

Change-Id: I42c86163034bda2728e0af07d30c9320ca37ab4f