Revert of Fall back to older inorder buffer if we have NVPR (patchset #3 id:40001 of https://codereview.chromium.org/1143153008/)
Revert of Fall back to older inorder buffer if we have NVPR (patchset #3 id:40001 of https://codereview.chromium.org/1143153008/)

Reason for revert:
breaking bots

Original issue's description:
> Fall back to older inorder buffer if we have NVPR
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/b72ec98b2090e5728354dac66eb1886a28e4da6b

TBR=bsalomon@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

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

google/skia,todotodoo/skia,ominux/skia,pcwalton/skia,Jichao/skia,pcwalton/skia,shahrzadmn/skia,shahrzadmn/skia,shahrzadmn/skia,tmpvar/skia.cc,Jichao/skia,nvoron23/skia,shahrzadmn/skia,google/skia,aosp-mirror/platform_external_skia,noselhq/skia,nvoron23/skia,HalCanary/skia-hc,vanish87/skia,todotodoo/skia,noselhq/skia,noselhq/skia,shahrzadmn/skia,rubenvb/skia,ominux/skia,todotodoo/skia,vanish87/skia,tmpvar/skia.cc,google/skia,todotodoo/skia,aosp-mirror/platform_external_skia,google/skia,noselhq/skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,rubenvb/skia,Hikari-no-Tenshi/android_external_skia,Hikari-no-Tenshi/android_external_skia,qrealka/skia-hc,google/skia,HalCanary/skia-hc,tmpvar/skia.cc,rubenvb/skia,nvoron23/skia,ominux/skia,noselhq/skia,qrealka/skia-hc,google/skia,pcwalton/skia,tmpvar/skia.cc,nvoron23/skia,Jichao/skia,Hikari-no-Tenshi/android_external_skia,google/skia,Jichao/skia,qrealka/skia-hc,vanish87/skia,qrealka/skia-hc,shahrzadmn/skia,google/skia,shahrzadmn/skia,todotodoo/skia,HalCanary/skia-hc,rubenvb/skia,HalCanary/skia-hc,pcwalton/skia,pcwalton/skia,nvoron23/skia,qrealka/skia-hc,Jichao/skia,shahrzadmn/skia,HalCanary/skia-hc,todotodoo/skia,HalCanary/skia-hc,aosp-mirror/platform_external_skia,HalCanary/skia-hc,vanish87/skia,aosp-mirror/platform_external_skia,ominux/skia,ominux/skia,pcwalton/skia,google/skia,HalCanary/skia-hc,tmpvar/skia.cc,shahrzadmn/skia,noselhq/skia,noselhq/skia,pcwalton/skia,tmpvar/skia.cc,ominux/skia,rubenvb/skia,todotodoo/skia,Jichao/skia,rubenvb/skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,pcwalton/skia,Hikari-no-Tenshi/android_external_skia,nvoron23/skia,noselhq/skia,todotodoo/skia,ominux/skia,qrealka/skia-hc,noselhq/skia,google/skia,nvoron23/skia,tmpvar/skia.cc,aosp-mirror/platform_external_skia,tmpvar/skia.cc,todotodoo/skia,vanish87/skia,Jichao/skia,ominux/skia,aosp-mirror/platform_external_skia,rubenvb/skia,HalCanary/skia-hc,ominux/skia,vanish87/skia,nvoron23/skia,Jichao/skia,qrealka/skia-hc,pcwalton/skia,qrealka/skia-hc,rubenvb/skia,vanish87/skia,aosp-mirror/platform_external_skia,vanish87/skia,vanish87/skia,rubenvb/skia,tmpvar/skia.cc,nvoron23/skia,Jichao/skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,Hikari-no-Tenshi/android_external_skia,HalCanary/skia-hc,rubenvb/skia