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

* commit '23de8dc2625d4aeb4dc9085c5865ed571f96261a':
  Optimize layout rendering in layoutlib