Merge "simpleperf: fix test due to llvm-symbolizer upgrade."
am: 89f04a0381

Change-Id: Idb1abbbce008290462b7d8631a59bc2b64b9381c