GitLab

This resolves collisions if two grit targets with the same name (often
"resources") end up in the same output directory.

This reverts 289283 and replaces it with the unique output names rather than
the duplicative target names. The original problem was from 289264.

BUG=
R=joaodasilva@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#289691}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289691 0039d316-1c4b-4281-b951-d872f2087c98