Fix SDK repo to prevent mixing different targets. DO NOT MERGE.

This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

(cherry picked from commit 4df9f469f710b4eedde9020f7a35534a795edfb1)

Change-Id: I8ad6763ace0d6075a743b99fd65a5ae8b69bf3d5
2 files changed