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

* commit '88f5e78be2784be37cf4e4e6795d78dd6fc1d762':
  Fix VectorDrawableSetup checking

Change-Id: I6dc36f5ae7a386d81dec8026ba20b605efcd5aa4