Remove concatenation from Delete Flavors

Fix concatenation and pluralization problems with the Delete
Flavors action

Change-Id: I15f0b6cf0e12112687dd70fae48e9074202c83be
partial-bug: 1307476
Merge "Remove concatenation from Delete Flavors"