am f2d085e8: (-s ours) am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]

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