Merge "Fix layoutlib for KK" into klp-dev