Merge "Fix bug in proguard deobfuscation of file names."
am: 8050453ed5

Change-Id: Icf6fec7d2694e75d5e8f87bd2ff7faeb376a5037