fix reference to _PerGlyphInfo
fix reference to _PerGlyphInfo

BUG=skia:
TBR=bungeman@google.com
NOTRY=True
NOTREECHECKS=True

Review URL: https://codereview.chromium.org/1136283004

MinimalOS-AOSP/platform_external_skia,qrealka/skia-hc,YUPlayGodDev/platform_external_skia,w3nd1go/android_external_skia,PAC-ROM/android_external_skia,ominux/skia,google/skia,todotodoo/skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,spezi77/android_external_skia,aosp-mirror/platform_external_skia,MarshedOut/android_external_skia,ominux/skia,Hikari-no-Tenshi/android_external_skia,ominux/skia,HalCanary/skia-hc,OneRom/external_skia,AOSPB/external_skia,todotodoo/skia,geekboxzone/mmallow_external_skia,BrokenROM/external_skia,shahrzadmn/skia,ominux/skia,tmpvar/skia.cc,nfxosp/platform_external_skia,UBERMALLOW/external_skia,rubenvb/skia,UBERMALLOW/external_skia,rubenvb/skia,OneRom/external_skia,YUPlayGodDev/platform_external_skia,HalCanary/skia-hc,PAC-ROM/android_external_skia,noselhq/skia,VRToxin-AOSP/android_external_skia,Jichao/skia,google/skia,timduru/platform-external-skia,nfxosp/platform_external_skia,geekboxzone/mmallow_external_skia,rubenvb/skia,vanish87/skia,Infinitive-OS/platform_external_skia,boulzordev/android_external_skia,TeamExodus/external_skia,pcwalton/skia,nfxosp/platform_external_skia,VRToxin-AOSP/android_external_skia,YUPlayGodDev/platform_external_skia,boulzordev/android_external_skia,nvoron23/skia,MarshedOut/android_external_skia,pcwalton/skia,boulzordev/android_external_skia,timduru/platform-external-skia,w3nd1go/android_external_skia,qrealka/skia-hc,geekboxzone/mmallow_external_skia,vanish87/skia,Jichao/skia,nvoron23/skia,tmpvar/skia.cc,TeamExodus/external_skia,nvoron23/skia,qrealka/skia-hc,aosp-mirror/platform_external_skia,TeamExodus/external_skia,boulzordev/android_external_skia,google/skia,TeamTwisted/external_skia,TeamExodus/external_skia,MinimalOS-AOSP/platform_external_skia,PAC-ROM/android_external_skia,TeamTwisted/external_skia,tmpvar/skia.cc,ominux/skia,VRToxin-AOSP/android_external_skia,spezi77/android_external_skia,AOSPB/external_skia,TeamExodus/external_skia,google/skia,AOSP-YU/platform_external_skia,spezi77/android_external_skia,rubenvb/skia,noselhq/skia,Jichao/skia,AOSP-YU/platform_external_skia,MarshedOut/android_external_skia,PAC-ROM/android_external_skia,ominux/skia,timduru/platform-external-skia,vanish87/skia,YUPlayGodDev/platform_external_skia,VRToxin-AOSP/android_external_skia,spezi77/android_external_skia,google/skia,VRToxin-AOSP/android_external_skia,geekboxzone/mmallow_external_skia,TeamExodus/external_skia,vanish87/skia,noselhq/skia,MarshedOut/android_external_skia,rubenvb/skia,MinimalOS-AOSP/platform_external_skia,noselhq/skia,AOSP-YU/platform_external_skia,UBERMALLOW/external_skia,pcwalton/skia,Infinitive-OS/platform_external_skia,todotodoo/skia,Hikari-no-Tenshi/android_external_skia,google/skia,geekboxzone/mmallow_external_skia,tmpvar/skia.cc,boulzordev/android_external_skia,w3nd1go/android_external_skia,shahrzadmn/skia,google/skia,invisiblek/android_external_skia,TeamTwisted/external_skia,OneRom/external_skia,tmpvar/skia.cc,YUPlayGodDev/platform_external_skia,UBERMALLOW/external_skia,tmpvar/skia.cc,rubenvb/skia,geekboxzone/mmallow_external_skia,geekboxzone/mmallow_external_skia,pcwalton/skia,pcwalton/skia,Jichao/skia,Infinitive-OS/platform_external_skia,TeamExodus/external_skia,MinimalOS-AOSP/platform_external_skia,nfxosp/platform_external_skia,nvoron23/skia,UBERMALLOW/external_skia,qrealka/skia-hc,TeamTwisted/external_skia,aosp-mirror/platform_external_skia,google/skia,boulzordev/android_external_skia,todotodoo/skia,AOSP-YU/platform_external_skia,HalCanary/skia-hc,nvoron23/skia,TeamTwisted/external_skia,MarshedOut/android_external_skia,aosp-mirror/platform_external_skia,HalCanary/skia-hc,vanish87/skia,vanish87/skia,vanish87/skia,Jichao/skia,timduru/platform-external-skia,ominux/skia,aosp-mirror/platform_external_skia,invisiblek/android_external_skia,noselhq/skia,Hikari-no-Tenshi/android_external_skia,invisiblek/android_external_skia,MonkeyZZZZ/platform_external_skia,invisiblek/android_external_skia,noselhq/skia,MarshedOut/android_external_skia,tmpvar/skia.cc,w3nd1go/android_external_skia,AOSPB/external_skia,nfxosp/platform_external_skia,HalCanary/skia-hc,YUPlayGodDev/platform_external_skia,VRToxin-AOSP/android_external_skia,shahrzadmn/skia,MonkeyZZZZ/platform_external_skia,OneRom/external_skia,ominux/skia,Jichao/skia,AOSPB/external_skia,pcwalton/skia,qrealka/skia-hc,OneRom/external_skia,w3nd1go/android_external_skia,AOSP-YU/platform_external_skia,Hikari-no-Tenshi/android_external_skia,invisiblek/android_external_skia,spezi77/android_external_skia,MarshedOut/android_external_skia,todotodoo/skia,AOSP-YU/platform_external_skia,OneRom/external_skia,Infinitive-OS/platform_external_skia,aosp-mirror/platform_external_skia,vanish87/skia,UBERMALLOW/external_skia,ominux/skia,BrokenROM/external_skia,AOSPB/external_skia,nvoron23/skia,HalCanary/skia-hc,pcwalton/skia,MonkeyZZZZ/platform_external_skia,MarshedOut/android_external_skia,nfxosp/platform_external_skia,boulzordev/android_external_skia,w3nd1go/android_external_skia,w3nd1go/android_external_skia,qrealka/skia-hc,YUPlayGodDev/platform_external_skia,Infinitive-OS/platform_external_skia,nvoron23/skia,TeamExodus/external_skia,nfxosp/platform_external_skia,Infinitive-OS/platform_external_skia,timduru/platform-external-skia,timduru/platform-external-skia,vanish87/skia,BrokenROM/external_skia,todotodoo/skia,google/skia,VRToxin-AOSP/android_external_skia,PAC-ROM/android_external_skia,MonkeyZZZZ/platform_external_skia,Jichao/skia,MinimalOS-AOSP/platform_external_skia,BrokenROM/external_skia,MonkeyZZZZ/platform_external_skia,BrokenROM/external_skia,nvoron23/skia,AOSP-YU/platform_external_skia,w3nd1go/android_external_skia,AOSPB/external_skia,noselhq/skia,Infinitive-OS/platform_external_skia,todotodoo/skia,MonkeyZZZZ/platform_external_skia,todotodoo/skia,invisiblek/android_external_skia,Jichao/skia,UBERMALLOW/external_skia,YUPlayGodDev/platform_external_skia,timduru/platform-external-skia,PAC-ROM/android_external_skia,AOSP-YU/platform_external_skia,MonkeyZZZZ/platform_external_skia,MonkeyZZZZ/platform_external_skia,TeamTwisted/external_skia,rubenvb/skia,Hikari-no-Tenshi/android_external_skia,shahrzadmn/skia,OneRom/external_skia,AOSPB/external_skia,HalCanary/skia-hc,UBERMALLOW/external_skia,shahrzadmn/skia,AOSPB/external_skia,BrokenROM/external_skia,rubenvb/skia,tmpvar/skia.cc,YUPlayGodDev/platform_external_skia,shahrzadmn/skia,OneRom/external_skia,nvoron23/skia,pcwalton/skia,rubenvb/skia,invisiblek/android_external_skia,TeamTwisted/external_skia,nfxosp/platform_external_skia,Infinitive-OS/platform_external_skia,boulzordev/android_external_skia,VRToxin-AOSP/android_external_skia,shahrzadmn/skia,Hikari-no-Tenshi/android_external_skia,geekboxzone/mmallow_external_skia,tmpvar/skia.cc,Hikari-no-Tenshi/android_external_skia,PAC-ROM/android_external_skia,invisiblek/android_external_skia,HalCanary/skia-hc,OneRom/external_skia,PAC-ROM/android_external_skia,VRToxin-AOSP/android_external_skia,boulzordev/android_external_skia,noselhq/skia,TeamTwisted/external_skia,Jichao/skia,MarshedOut/android_external_skia,MonkeyZZZZ/platform_external_skia,geekboxzone/mmallow_external_skia,w3nd1go/android_external_skia,UBERMALLOW/external_skia,todotodoo/skia,Infinitive-OS/platform_external_skia,qrealka/skia-hc,MinimalOS-AOSP/platform_external_skia,google/skia,aosp-mirror/platform_external_skia,HalCanary/skia-hc,BrokenROM/external_skia,pcwalton/skia,AOSPB/external_skia,BrokenROM/external_skia,spezi77/android_external_skia,HalCanary/skia-hc,MinimalOS-AOSP/platform_external_skia,TeamExodus/external_skia,Hikari-no-Tenshi/android_external_skia,AOSP-YU/platform_external_skia,aosp-mirror/platform_external_skia,qrealka/skia-hc,rubenvb/skia,PAC-ROM/android_external_skia,noselhq/skia,MinimalOS-AOSP/platform_external_skia,TeamTwisted/external_skia,shahrzadmn/skia,nfxosp/platform_external_skia,shahrzadmn/skia,MinimalOS-AOSP/platform_external_skia