Add action bar to display the option menu items am: 48544354fe
am: 04ad4e5d8e

Change-Id: Ibebfffc76fdfde34cd5ff4cbb591b7cc597d3989