Make flavor-list regexp more robust

This was failing for me due to different amounts of
whitespace in the output.

Change-Id: Id8cb7b63f770504df535542dd420f20a70b4b071
Merge "Make flavor-list regexp more robust"