Merge "Fix the CSL theme support inside VectorDrawable's fill and stroke" into nyc-dev