Reland "Don't include shorty in DexProto hashCode"

This reverts commit 41340f63579086db256642030094131edbb83bdd.

Clean reland after updating method generation to be in sorted order.

Bug: b/172206529
Change-Id: If1cf38115fb7de5dea3eebf9d072f52c358b8aca
diff --git a/src/main/java/com/android/tools/r8/graph/DexProto.java b/src/main/java/com/android/tools/r8/graph/DexProto.java
index 6ca01ec..745c149 100644
--- a/src/main/java/com/android/tools/r8/graph/DexProto.java
+++ b/src/main/java/com/android/tools/r8/graph/DexProto.java
@@ -57,7 +57,7 @@
 
   @Override
   public int computeHashCode() {
-    return shorty.hashCode() * 7 + returnType.hashCode() * 13 + parameters.hashCode() * 31;
+    return returnType.hashCode() * 7 + parameters.hashCode() * 13;
   }
 
   public DexType getReturnType() {
diff --git a/third_party/api_database/api_database.tar.gz.sha1 b/third_party/api_database/api_database.tar.gz.sha1
index 5749b41..7717064 100644
--- a/third_party/api_database/api_database.tar.gz.sha1
+++ b/third_party/api_database/api_database.tar.gz.sha1
@@ -1 +1 @@
-9570931632e830d695b18bd83f69456c74196d6e
\ No newline at end of file
+f1d87fa568ba769b5bf72b9f5a45a376c7465dda
\ No newline at end of file