improvement for Android.mk