Fix building issues for Android makefiles