Trying to fix a multiple deployment problem on Android
A few more modifications to clean up the manifest stuff