Revert changes to GrContext::resolveRenderTarget
Revert changes to GrContext::resolveRenderTarget

TBR=joshualitt@google.com,egdaniel@google.com

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

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