Merge "simpleperf: add symbol defore demangle in protobuf interface." am: a9bd5339e3
am: e887163a7a

Change-Id: Icbbd26827268a018799aad7e92e05eeffd2345a5