Merge "fix cm git location" into jb-mr1

Conflicts:
	default.xml
	kernel_manifest.xml

Change-Id: I4f11c9daa2baabe60d01dd51db13c9628d94ec13