Delay copying effects from DS or ODS till end of creating ODS

Also delay the removal of fixed function VA's until so we only have to do a single removal step

BUG=skia:

Review URL: https://codereview.chromium.org/634073002
2 files changed