Merge "Roll external/skia 08b44fa49..22e536e3a (3 commits)"