use KeyringTestHelper.diffKeyrings method for unit test

Conflicts:
	OpenKeychain/src/test/java/tests/UncachedKeyringTest.java

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/testsupport/KeyringTestingHelper.java

@@ -60,7 +60,7 @@ public class KeyringTestingHelper {
         }
 
         public int hashCode() {
-            System.out.println("tag: " + tag + ", code: " + Arrays.hashCode(buf));
+            // System.out.println("tag: " + tag + ", code: " + Arrays.hashCode(buf));
             return Arrays.hashCode(buf);
         }
     }