builds without linaro

This reverts commit 34457e80a628df906d38b26962542f2d6664d5fc.

Conflicts:

	default.xml