[flashrom-gerrit] [S] Change in flashrom[master]: Revert "cmocka: Drop as meson subproject"