Merge "Sync more precompilation updates from upstream Skia" into main