am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a
automerge: 9a6d8ae

* commit '9a6d8ae25522f88191e8b7d817c1d4e5816b642b':
  Support framework menus in ActionBar