Merge "Fix layoutlib build breakage" into mnc-dev