Merge "ApplicationLoaders: improve classloader cache errs" am: 6bfe7f9a26 am: bf9f6b4f3b am: 96894457f7 am: dda9aa4f65

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399628

Change-Id: Ib3d2e32ba6c0130fa07475c9c25c1a63b76d9ce7

core/java/android/app/ApplicationLoaders.java

@@ -232,8 +232,8 @@ public class ApplicationLoaders {
 
         // cached must be built and loaded in the same environment
         if (!sharedLibrariesEquals(sharedLibraries, cached.sharedLibraries)) {
-            Log.w(TAG, "Unexpected environment for cached library: (" + sharedLibraries + "|"
-                    + cached.sharedLibraries + ")");
+            Log.w(TAG, "Unexpected environment loading cached library " + zip + " (real|cached): ("
+                    + sharedLibraries + "|" + cached.sharedLibraries + ")");
             return null;
         }