am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev

* commit '0db6e6a567e25d560586863c7be654a0c1da5795':
  Optimize layout rendering in layoutlib