Merge "Hack around skia:3570 for now." into master-skia

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

Change-Id: I68fd27d12890ee349550d19f4f8b46b9e66e7930