Generalize extract-files to be more similar between dream and sapphire

Bug: 1869158
Change-Id: Ic84960c41022508a607117ad7b97594fc557e55b
1 file changed