Merge "Roll external/skia f9ad5ba8f..e19a4f261 (7 commits)"