Merge "Fix the CSL theme support inside VectorDrawable\'s fill and stroke" into nyc-dev am: 6f1033104d
am: 67eefa3c73

* commit '67eefa3c7398760382258ef441feb75d6752e3a2':
  Fix the CSL theme support inside VectorDrawable's fill and stroke