Merge "More layoutlib tests." into lmp-mr1-dev