update gradle build scripts to be consistent; cleanup AndroidManifest files

Ok.