Merge "Revert "VectorDrawable native rendering - Step 5 of MANY"" into nyc-dev