Manifest: some tune-ups

* only sync the current branch being used

Change-Id: I93a0e3ad0facf19f7cde8d6bbf94a8e141adecb3
Merge remote-tracking branch 'carbon/kk' into kk

Conflicts:
	default.xml