Merge branch 'kitkat-legacy' of github.com:AOSPAL/manifest into kitkat-legacy

Conflicts:
	default.xml