Merge "Fix bug in proguard deobfuscation of file names."