Merge "Revert "Revert "VectorDrawable native rendering - Step 4 of MANY"""