am 91977396: Merge "Fix bug to render status bar icons" into lmp-preview-dev

* commit '9197739603eb34df6cbc85c6a7fa0ea359e4776b':
  Fix bug to render status bar icons
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
index 24664c7..9bc86a0 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
@@ -128,9 +128,10 @@
         if (mSimulatedPlatformVersion == 0) {
             String path = pathOut[0];
             String dirName = path.substring(0, path.lastIndexOf('/'));
-            pathOut[0] = dirName + "-v21" + "/" + iconName;
-            InputStream stream = getClass().getResourceAsStream(pathOut[0]);
+            path = dirName + "-v21" + "/" + iconName;
+            InputStream stream = getClass().getResourceAsStream(path);
             if (stream != null) {
+                pathOut[0] = path;
                 return stream;
             }
         }