Update extract-files setup

Change-Id: I09c0cd63c934bb1a9446d31a8180f8e9302f55aa
Merge "Update extract-files setup" into kitkat