am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev

* commit 'b6f3708d330872232a6a57a1a5c0d2243fd7419e':
  Update delegate methods in layoutlib.