Merge branch 'kitkat' of https://github.com/AOSPA-legacy/manifest into HEAD

Conflicts:
	default.xml

Change-Id: I54144cfa242c48f82ee239d12fd718b4749a815a