Merge "SaveFlags be-gone" into master-skia

https://skia.googlesource.com/skia/+/5f6102d

Change-Id: I83deca4417b2d1043a119bf9450ed54abb128985