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

* commit '289f1ffb33d9ab7ed1a7c11bcc70c017b3a1c710':
  Optimize layout rendering in layoutlib [DO NOT MERGE]