Merge "Fix VectorDrawableSetup checking" into nyc-dev