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

* commit '1044a1dc197a9508ef8c6b352e7983ff234b8bc4':
  Update delegate methods in layoutlib.