Merge "Support framework menus in ActionBar" into lmp-dev