Update extract-files setup

Change-Id: I09c0cd63c934bb1a9446d31a8180f8e9302f55aa
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	extract-files.sh

Change-Id: Icfb8c12faf979549ee4f8af4335952fe2f1e364f