Merge change 5348

* changes:
  Add missing filename remap to RenamingDelegatingContext

test-runner/android/test/RenamingDelegatingContext.java

@@ -136,6 +136,11 @@ public class RenamingDelegatingContext extends ContextWrapper {
             return false;
         }
     }
+    
+    @Override
+    public File getDatabasePath(String name) {
+        return mFileContext.getDatabasePath(renamedFileName(name));
+    }
 
     @Override
     public String[] databaseList() {