Merge "Tinker with SkLazyFnPtr a bit." into master-skia

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

Change-Id: I335cf5b363be56b80ae613342abddc9313a20969