Merge "Add support for tools:menu" into idea133
automerge: f97852e

* commit 'f97852ed287f6c8a26414ae163e5423f9af1d0b9':
  Add support for tools:menu