Manifest update for cm-10.2

Change-Id: I081eb4922ec7777aeade6b0265df34154f595ae1
Update new project paths

Change-Id: I950c266061352639a2ddc97edb6eaa4688c3d863
Merge branch 'cm-10.2' into cm-10.2

Change-Id: I50f68aa709340d2be3131dac1f2d22ec0230a119
Merge remote-tracking branch 'upstream/cm-10.2' into HEAD

Conflicts:
	default.xml

Change-Id: I107b1745a393547fe8d5a5f6183bbba9462ad286