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

* commit '8f0acaf0f28c4bd82b563f6ee0f8f7ae74961957':
  Fix VectorDrawable_Delegate and DrawerLayout

Change-Id: Ib59f534436dba2a455c48165faabf1ce7be0a2b0