Merge "Roll external/skia fd98c2c87..722efde79 (4 commits)"