Merge "pass SkGlyphCache into updateGlyphCache()"