Merge branch 'master' of https://github.com/AOSPAL/toolchain_manifest

Conflicts:
	default.xml