Merge "Roll external/skia e8161dd15..fc9624cb8 (3 commits)"