back to plain arm for the night
back to plain arm for the night

It's looking like the previous CL did not fix the Daisy bot GMs,
even though that's still the only bit of code I can find that was
ignoring color order.  Puzzled.  Reverting arm_version=7 for now.

BUG=skia:1843

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

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