added Android.mk/clean up mk files/ more d2 cm merges