Revert Android.mk to before my changes