JOP40G
Fix qcom builds
Merge remote-tracking branch 'upstream/jb42' into jb42

Conflicts:
	.directory