Update manifest for cm-11

Change-Id: Ie49fb11669396bc1594e55824cae8d36ce439596

Conflicts:
	default.xml