Merge \"Cleanup pass over layout files in design samples\" into nyc-support-24.1-dev
am: d75dc89ae2

Change-Id: I9525f18f6513b5b93ddf630bb135ad0abbdff66a