Merge "Fix layoutlib build."