Merge "Fix a few more delegate methods in layoutlib."