am 5d376860: Merge "Avoid split action bar when it only has one item.  DO NOT MERGE." into jb-mr1.1-dev

* commit '5d376860e9c76c4026b824dfd4b4d295541f4fef':
  Avoid split action bar when it only has one item.  DO NOT MERGE.