(Android) Some changes to Android.mk to allow for x86 build later on