Merge "Fix layoutlib build" into klp-dev