Merge "Merge latest Skia into master (5 commits)"