Refactor extract-files and proprietary files for common vendor

Change-Id: Ief399cf8a6fa349f342e9865af19b72e3630805e