Improved AndroidManifest and Makefile