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

* commit '33996b98787c4625f9cd4a8e38e6a88458773276':
  Support framework menus in ActionBar