Merge \\"simpleperf: fix test record_cmd.dump_symbols.\\" am: b17b6c3edf
am: b64c877c4e

Change-Id: I6900301da63b9ce60d7eb821be8591fdc9145794