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

* commit '72fc6beee0d7af77e3977542f1db6fa84acddf08':

Change-Id: I79018e692201a0e667f84b58db9c65b7a25fdf6e