Fix flavors tests so they can be run in parallel

Fixes flavors tests so they use different flavor ids and
different flavor names for each individual test. This allows them
to be run in parallel without them interfering with each other.

Change-Id: I18840de7cdf8140677ac96665fca1a1209142ecf
Merge "Fix flavors tests so they can be run in parallel"