Set default value of flavorid to "auto"

Fixes: Bug #1189877
Change-Id: I80a0834c5f1d264b64f14d78fa2f71b1e4d9d89a
Merge "Set default value of flavorid to "auto""