Revert "track local vendor/cm"

This reverts commit 028bee2ab13d18b971694f0478f3427776082953.
Revert "fix vendor/cm branch"

This reverts commit 5172d837889574bf9271a3fec7497b7454513562.
Merge branch 'cm-11.0' into stable/cm-11.0

Conflicts:
	local_manifest.xml