track system/qcom

Change-Id: I195ef214414c5bcacde9bcead04193c77c395748

Conflicts:
	default.xml
Merge branch 'jb43' of https://github.com/moongato/platform_manifest into jb43