extract-files: update for new setup-makefiles

Change-Id: Id8779f2e01986a8a601b8dfca3c18eb9fb0e2143
init: Use userdata by name to detect GPE

Change-Id: I563236c25b151a51522adc81b8498fdb8bd9b1f3