am cdd24efe: am c83212a7: am 09a09623: Use standard actionbar when possible

# Via Android Git Automerger (2) and Paul Westbrook (1)
* commit 'cdd24efe7cfda8f69c6d30efa84d9f43666fb9d8':
  Use standard actionbar when possible