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

* commit '04b0d780bc9aea597d50635f610a3018ba8826c4':
  Fix VectorDrawable_Delegate and DrawerLayout

Change-Id: Iaf18869cde4ea7bdb93c8d85e77a5a4a2bc53262