Merge "Update delegate methods in layoutlib." into klp-dev