(starting with mtklein's 966503002 mod to 963593003) fix casts
(starting with mtklein's 966503002 mod to 963593003)
fix casts

Committed: https://skia.googlesource.com/skia/+/9e73a84deb5e6c201081b1d30175863898543e8d

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

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