am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev

* commit '90b0b69cd48067b92a90ea248ef91e473b7f1c10':
  Optimize layout rendering in layoutlib [DO NOT MERGE]