Fix up the Android.mk to look better