Let's see if this fixes the build errors
Signed-off-by: PipelinerArd <kristoferard@gmail.com>
Merge branch 'jb-mr2' of https://github.com/PipelinerArd/platform_manifest into jb-mr2

Conflicts:
	default.xml