am 469b4aea: am 35f9f310: am 5e6a2990: (-s ours) am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]

* commit '469b4aeaebe3b98efb623b9904e2d300d8ceacd7':
  Optimize layout rendering in layoutlib [DO NOT MERGE]