Update Android.mk; build cm