extract-files: update for new setup-makefiles

Change-Id: Id8779f2e01986a8a601b8dfca3c18eb9fb0e2143
Merge branch 'cm-11.0' into kk_mkt