Fix extract-files logic

Change-Id: Ie58b38d83661537567c835cfefe7044f14d9efdf
Merge "Fix extract-files logic" into kitkat