serrano: Modify extract script for consolidated vendor

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