Merge "simpleperf: better support kernel symbols when running as root." am: fbc7062e9b
am: e9488b3fec

Change-Id: I3328a1bfa0209b2ae39302e642051940795f70b0