Revert "Android: Update version of retrace.jar to 6.0.3"

This reverts commit bd3c0e676955a999600b966e2c02bec00dbacabf.

Reason for revert: Broke angle_perftests

Original change's description:
> Android: Update version of retrace.jar to 6.0.3
> 
> The existing version was found to infinite loop at times.
> Also moves the jars to CIPD
> 
> NOTRY=true # windows bot failing
> 
> Bug: 876539
> Change-Id: If822837f4958434372ef0cb40799aec32ec7cd37
> Reviewed-on: https://chromium-review.googlesource.com/1187003
> Commit-Queue: agrieve <agrieve@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#585887}

TBR=agrieve@chromium.org,jbudorick@chromium.org

Change-Id: Icd2cf44c9e48390f6b13641d6fac97fd0f75df5d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 876539, 877619
Reviewed-on: https://chromium-review.googlesource.com/1188866
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#585955}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 78561f5b9dca2d5e742a43ddf0f553eaf4a76c70
diff --git a/BUILD.gn b/BUILD.gn
index 0e66b63..e43a60d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -4,22 +4,19 @@
 
 import("//build/config/android/rules.gni")
 
-# This target is used only by the test runner to list tests as well as to
-# deobfuscate via retrace. proguard.jar (v5.2.1) is used when building, and is
-# reference directly via "java -jar proguar.jar"
-java_prebuilt("proguard603_java") {
-  jar_path = "lib/proguard603.jar"
+java_prebuilt("proguard_java") {
+  jar_path = "lib/proguard.jar"
   data = [
-    "$root_build_dir/lib.java/third_party/proguard/proguard603.jar",
+    "$root_build_dir/lib.java/third_party/proguard/proguard.jar",
   ]
 }
 
 java_prebuilt("retrace_java") {
-  jar_path = "lib/retrace603.jar"
+  jar_path = "lib/retrace.jar"
   deps = [
-    ":proguard603_java",
+    ":proguard_java",
   ]
   data = [
-    "$root_build_dir/lib.java/third_party/proguard/retrace603.jar",
+    "$root_build_dir/lib.java/third_party/proguard/retrace.jar",
   ]
 }
diff --git a/README.chromium b/README.chromium
index bd0aceb..14b6982 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: Proguard
 URL: http://proguard.sourceforge.net/
-Version: 5.2.1_and_6.0.3
+Version: 5.2.1
 Date: June 22, 2016
 License: GPL v2
 License File: NOT_SHIPPED
@@ -10,7 +10,3 @@
 This directory includes proguard.jar to allow Chromium to shrink, optimize java
 classes for Android, as well as retrace.jar, to allow for deobfuscation of stack
 traces.
-
-Proguard is kept at 5.2.1 because all newer versions were found to optimize in a
-way that breaks Chrome. Retrace is at 6.0.3 because version 5.2.1 was found to
-infinite loop when deobfuscating certainly strings.
diff --git a/cipd.yaml b/cipd.yaml
deleted file mode 100644
index ddcbd18..0000000
--- a/cipd.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml
-package: chromium/third_party/proguard
-data:
-  - file: lib/proguard.jar
-  - file: lib/proguard603.jar
-  - file: lib/retrace603.jar
diff --git a/lib/proguard.jar b/lib/proguard.jar
new file mode 100644
index 0000000..c670fe9
--- /dev/null
+++ b/lib/proguard.jar
Binary files differ
diff --git a/lib/retrace.jar b/lib/retrace.jar
new file mode 100644
index 0000000..408712f
--- /dev/null
+++ b/lib/retrace.jar
Binary files differ