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 '30ab17dde6fb47505be493cb09983e268f97c1e9':
  Optimize layout rendering in layoutlib [DO NOT MERGE]