Merge "fix for valgrind preAbandonGpuContext" into master-skia

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

Change-Id: I3824d1597870a56d6248e440203577e0807dcd34