cm: Update use of vendor/extra `

 * Use inherit-product to pick up extra configuration

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

Conflicts:
	config/common.mk

Change-Id: Ibaaa34143b311e152d08cff1e28fab16a573d057