revert some things
Merge branch 'kk-4.4' of https://github.com/markewebber/platform_manifest into kk-4.4

Conflicts:
	default.xml
revert some things