[flashrom-gerrit] Change in flashrom[stable]: Move ich_layout from layout.h to ich_descriptors.h