Updated default location for sourceManifestFile & AndroidManifestFile + ...

...Removed updatedManifestFile parameter


See #508

Once this is ok for everybody I will also change the other branch for the ManifestMerger v2 to use the sourceManifestFile and output the result to androidManifestFile.