Make the Android.mk work in more situations