serranoltexx: Modify extract script for consolidated vendor

Change-Id: Iee3a2e67aabde14fc2ef716b0e18b6c522404b0e
serranoltexx: Unify European and Canadian variant

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

Conflicts:
	mokee.mk

Change-Id: Iddccfdf659e066cc72fb16337ea30c7cef71c4ed