Update extract-files and proprietary for common vendor

Change-Id: Iee995821a1e6dfc72c2e01552cae21d2fef47a1c
Refactor extract-files and proprietary files for common vendor

Change-Id: I6d814aa450a8bffa5682a853654365a8650eb8a0