Merge "simpleperf: fix deobfuscating Java symbols."