Update manifest for V2.0
Merge remote-tracking branch 'upstream/kitkat' into kitkat

Conflicts:
	default.xml