Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev
am: 8fc7ca05e5

* commit '8fc7ca05e5ce3a8774be2abb0742b993431bff63':
  Fix VectorDrawable_Delegate and DrawerLayout

Change-Id: I2c438e5236346a2fa7147b7a9a88eaa2f4a67993