[flashrom-gerrit] Change in flashrom[master]: flash: move nested struct to top level