added changes for (cross) compilation for Android