am 94613752: Merge "Rework action bar menus." into honeycomb

* commit '946137520d67d3c18ceaba058e622f24b7fbf04d':
  Rework action bar menus.