Move gm-expected to trunk/expectations/gm , and modify scripts that use it.

buildbot/tools/tests/factory_configuration/expected/Test-Android-Nexus7-Tegra3-Arm7-Debug-Trybot

 {
     'TargetPath': <Object>,
     '_autogen_svn_password_file': '.autogen_svn_password',
     '_autogen_svn_username_file': '.autogen_svn_username',
     '_build_targets': [
         'all',
     ],
     '_builder_name': 'Test-Android-Nexus7-Tegra3-Arm7-Debug-Trybot',
     '_common_args': [
         '--autogen_svn_baseurl',
@@ skipping 45 matching lines @@
     '_default_clobber': <Object>,
     '_deps_target_os': 'android',
     '_device': 'nexus_7',
     '_do_patch_step': <Object>,
     '_do_upload_bench_results': <Object>,
     '_do_upload_results': <Object>,
     '_env_vars': {},
     '_flavor': 'android',
     '_gclient_solutions': [
         '{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},',
-        '{ "name": "gm-expected/base-android-nexus-7", "url": "http://skia.googlecode.com/svn/gm-expected/base-android-nexus-7", "custom_deps": {},"custom_vars": {},},',
-        '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},',
     ],
     '_gyp_defines': {
         'skia_arch_width': '32',
         'skia_warnings_as_errors': '0',
     },
     '_make_flags': [],
     '_perf_output_basedir': None,
     '_skia_cmd_obj': <Object>,
     '_skia_svn_password_file': '.skia_svn_password',
     '_skia_svn_username_file': '.skia_svn_username',
@@ skipping 110 matching lines @@
                     'android',
                     '--device',
                     'nexus_7',
                     '--serial',
                     <Object>,
                     '--has_root',
                     <Object>,
                     '--android_sdk_root',
                     <Object>,
                     '--gclient_solutions',
-                    '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-android-nexus-7", "url": "http://skia.googlecode.com/svn/gm-expected/base-android-nexus-7", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"',
+                    '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},']"',
                 ],
                 'description': 'Update',
                 'doStepIf': <Object>,
                 'env': {},
                 'flunkOnFailure': <Object>,
                 'get_props_from_stdout': {
                     'got_revision': 'Skia updated to revision (\d+)',
                 },
                 'haltOnFailure': <Object>,
                 'hideStepIf': <Object>,
@@ skipping 1974 matching lines @@
                 'haltOnFailure': <Object>,
                 'hideStepIf': <Object>,
                 'is_rebaseline_step': <Object>,
                 'is_upload_step': <Object>,
                 'timeout': <Object>,
                 'workdir': 'build/trunk',
             },
         ],
     ],
 }