Revert "its fucked, lets try to unfuck it"

This reverts commit 8ff5d2dcfb981981e1df8be6c8f53fa57668ce92.

Conflicts:
	configs/Android.mk