Changes to Android.mk