Fix extract-files for apk's

Change-Id: I78bcc90443bdad1d8e55f1ef70181434faa838be