Updated Core Android.mk to match caf folders