am fb45a2e9: Merge "Fix layoutlib build" into klp-dev

* commit 'fb45a2e9cde403c4bb7ac62195795bcfad4b8da6':
  Fix layoutlib build