Adds non-1 scalar to config names.

BUG=
R=robertphillips@google.com, bungeman@google.com, halcanary@google.com, scroggo@google.com, borenet@google.com

Author: bensong@google.com

Review URL: https://codereview.chromium.org/106823005

git-svn-id: http://skia.googlecode.com/svn/trunk@12811 2bbb7eff-a529-9590-31e7-b0007b416f81
1 file changed