Merge "Revert vector drawables for menu icons" into nyc-dev
am: 45db612fc3

* commit '45db612fc3daec0ba49f7406e4bdd50ca1e5a4ad':
  Revert vector drawables for menu icons

Change-Id: If9113175eae4ae7441f1839f181339d4b47212f1