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
Fix Mockito path

Change-Id: Ia307dedc4b9871e63822789608b536fcf4ca7926
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android into cm-10.2

Signed-off-by: David Rodero <david@codiguiel.net>

Conflicts:
	default.xml