am f581b533: am 2b662e8e: Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev

* commit 'f581b533cf0ff774405bae057f5883fe9768c6a8':
  Fix a NPE in MenuItemImpl when setting null ActionProvider