Merge "Fix memory leak in MultiPictureDraw GM" into master-skia

https://skia.googlesource.com/skia/+/ab79ab5

Change-Id: I9e880999b146a00efd27adca4a1363473d23cf2f