fixes for the manifest merger requirements brought in by android-studio 0.6