Merge "Fix surface leak in multidraw GMs." into master-skia

https://skia.googlesource.com/skia/+/892f31a

Change-Id: I0aba502cb10b41d4e04eebdb6cea1e59fd65c127