added Android.mk and changed AndroidManifest.xml