Update Android.mk to use everything we need