Merge "Add layoutlib tests to DIST_DIR" into lmp-dev