Revert of chromium_android: Add device affinity to links

scripts/slave/recipes/cronet.expected/android_cronet_data_reduction_proxy_builder.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
       "[START_DIR]"
     ],
     "name": "cleanup index.lock",
     "~followup_annotations": [
@@ skipping 534 matching lines @@
       "--blacklist-file",
       "[START_DIR]/src/out/bad_devices.json"
     ],
     "env": {
       "CHROMIUM_OUTPUT_DIR": "[START_DIR]/src/out/Release",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[START_DIR]/src/third_party/android_tools/sdk/platform-tools:[START_DIR]/src/build/android:%(PATH)s"
     },
     "name": "page_cycler.foo",
     "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>Device Affinity: 0<br/>@@@",
-      "@@@STEP_LOG_LINE@device affinity@0@@@",
-      "@@@STEP_LOG_END@device affinity@@@"
+      "@@@STEP_TEXT@<br/>Device Affinity: 0<br/>@@@"
     ]
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
@@ skipping 24 matching lines @@
       "--blacklist-file",
       "[START_DIR]/src/out/bad_devices.json"
     ],
     "env": {
       "CHROMIUM_OUTPUT_DIR": "[START_DIR]/src/out/Release",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[START_DIR]/src/third_party/android_tools/sdk/platform-tools:[START_DIR]/src/build/android:%(PATH)s"
     },
     "name": "perf_test.foo",
     "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>Device Affinity: 0<br/>@@@",
-      "@@@STEP_LOG_LINE@device affinity@0@@@",
-      "@@@STEP_LOG_END@device affinity@@@"
+      "@@@STEP_TEXT@<br/>Device Affinity: 0<br/>@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[START_DIR]/src/build/symlink.py",
       "-f",
       "[START_DIR]/src/third_party/android_tools/sdk/platform-tools/adb",
       "~/adb"
@@ skipping 369 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]