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

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