Merge "Fix VectorDrawableSetup checking" into nyc-dev am: 88f5e78be2 am: 42016449e6
am: 39d54cab53

* commit '39d54cab5320f62fa07423592ddfb099e23fac16':
  Fix VectorDrawableSetup checking

Change-Id: Ic401bea1bacaaad24849d181717786ca4ae8b17f