Merge "Add support for decoding proguard map to report_sample.py"