Closes-Bug: #1363368 rerunning of setup fails during flavor create

The flavor create is not done based on already present. This causes
setup to fail if run again.

Change-Id: I4d80e706b713d59c8bb20c4f263144cf092679d4