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

* commit '28e049ef73f5d9301a198ac53535442b697b7ef4':
  Optimize layout rendering in layoutlib