Revert of simplify clip inside a layer -- will be applied in restore (patchset #2 id:20001 of https://codereview.chromium.org/997763002/)
Revert of simplify clip inside a layer -- will be applied in restore (patchset #2 id:20001 of https://codereview.chromium.org/997763002/)

Reason for revert:
slight rebaselines needed in layouttests

http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/51755

Original issue's description:
> simplify clip inside a layer -- will be applied in restore
>
> BUG=skia:
> TBR=
> NOTREECHECKS=True
>
> speculative land to measure performance
>
> Committed: https://skia.googlesource.com/skia/+/c275493d4247a2c5ae845d340c4297258f4684bc

TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

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

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