This applies commit 88441bfc0f712ad451784851bfcf0b0cc418ad75 from the skia_rev_130a118cc68f8f9973e9572356011de378463fea branch to master so master works in the Fuchsia build again.