Updated for newer ADK, fixed some errors in AndroidManifest