am cabb2669: (-s ours) am f2cf3c19: (-s ours) am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'cabb2669def2d32d5fd93b2fa6b8a036da0b3e70':