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

Bug: 1869158

Change-Id: Ie74758a14de8adb182abec32f86847c910404b24
1 file changed