Merge "Add manual VectorDrawable tests for CSL related issue"