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

* commit '42016449e6136fe4df5f855f96482868c77034bd':
  Fix VectorDrawableSetup checking

Change-Id: I3fa6a2038a186ab797ae106a3d5dcb3bf04369b6