Conditional delete of flavor in test tearDown

This patch fixes a bug where the test tearDown was deleting flavor
that was not created by the test.

Change-Id: If658f1c87d965b46a1b20ba9ee86b86e2d222fae
Merge "Conditional delete of flavor in test tearDown"