Fix extract files logic

Change-Id: I6b963ff75be336a28f680f6dba61b53350c49283
proprietary-files: Organize by usage

Change-Id: I5e7dfe673a9b1a74565106dfd33562a61abaf7fc
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0