Merge "Roll external/skia 0a57971f0..fbc887df7 (1 commits)"