Revert "track local vendor/cm"

This reverts commit 028bee2ab13d18b971694f0478f3427776082953.
Merge branch 'cm-11.0' into perf/cm-11.0

Conflicts:
	local_manifest.xml

Change-Id: Ib69c3796227ad99abf7d574196c808622e24554a