Revert of Add --skip_cpu and --skip_gpu options to tests (https://codereview.chromium...

Revert of Add --skip_cpu and --skip_gpu options to tests (https://codereview.chromium.org/144343004/)

Reason for revert:
Broke tests on Win7 and Mac

Original issue's description:
> Add --skip_cpu and --skip_gpu options to tests
>
> BUG=skia:2074
>
> Committed: http://code.google.com/p/skia/source/detail?r=13223

R=djsollen@google.com, mtklein@google.com
TBR=djsollen@google.com, mtklein@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2074

Author: borenet@google.com

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

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