AndroidManifest and build.gradle tweaks