Update manifest for cm-12.0

Change-Id: Ic9285dc8b2d04549636da5b57b0f003b5d850302
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0

Conflicts:
	default.xml