Merge "Fix VectorDrawableSetup checking" into nyc-dev am: 88f5e78be2
am: a5874e1e47

* commit 'a5874e1e47bda6f4126bcac20157c5936c212241':

Change-Id: Id515bd3918e18deeb8c242a8e19498d9ea7e880c