Merge "simpleperf: fix dumpping kernel symbols." am: fb7b130078
am: 16b0b3d73a

Change-Id: Ifab1c202acf041843ea2a0efb26273b2bffdbb2e