Use correct arguments to flavor-key

Use correct arguments to flavor-key action when setting flavor
extra-specifications.

Change-Id: Ie6ceb8208a659961673cbae314568282e2cc005a
Closes-Bug: #1320281
backport: icehouse
Merge "Use correct arguments to flavor-key"