remove msm8660 project
Remove duplicate camera project
Change display to CM
Change display project to CM
Merge branch 'staging' of https://github.com/shumashv1/Schizoid into staging

Conflicts:
	default.xml