Merge "Modify VectorDrawable to scale path through canvas matrix"