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

* commit '031f4bebb05a4a6e59df9cce995dbfdfe54f8300':
  Optimize layout rendering in layoutlib [DO NOT MERGE]