am e7c3ed44: (-s ours) am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]

* commit 'e7c3ed442753c0ada27450868adcf1ff98fe9c39':
  Action bar rendering in layoutlib [DO NOT MERGE]