Why call mvn when rename-instrumentation-target-package is passed to `aapt`?

I think the clean.apk manifest update should probably use aapt's `rename-instrumentation-target-package` and `rename-manifest-package` instead of compiling xml.

Are you renaming the manifest in addition to the instrumentation? That's important if you want more than one server on the device.