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

* commit '38f2b1ea4146a52f167d1a73e705590266848336':
  Optimize layout rendering in layoutlib [DO NOT MERGE]