[flashrom-gerrit] Change in flashrom[master]: Forward-port Arthur's patch for latest upstream flashrom