am c65e0c95: Merge "Fix a few more delegate methods in layoutlib."

* commit 'c65e0c95c855de4505a320b6dcd66df5397c88d5':
  Fix a few more delegate methods in layoutlib.