Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev