am ce33060c: am 563d0ee7: am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev

* commit 'ce33060c92a8e0d739f020b6227f2ee6007724fe':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]