Merge "Fix layoutlib tests." into lmp-dev