settings-gen: rename extra-var to extra-vars

Change-Id: I86896fa1e892013e17c100d1d564c75e2df5e495