GitLab

1) Updates the script that executes the tests on the swarming bot by
accepting a flag for the benchmark to shard map.  We now have at least
three use cases for this: main perf waterfall android and desktop,
smoke testing, testing on our trybot and potentially android go.

2) Updates the custom merge script to not upload perf results when
we are in smoke test mode.

Bug:840427
Change-Id: Idec8f45cc2d1b5a3cd336ef3d1698d3d86161ba3

NOTRY=true  # win_7_chromium_rel_ng flaky

Change-Id: Idec8f45cc2d1b5a3cd336ef3d1698d3d86161ba3
Reviewed-on: https://chromium-review.googlesource.com/1055614
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#558900}