rebase nvpr after ds on stack

TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/726103004
one more rebase on k1

TBR=
BUG=skia:

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