Merge "Support to use kallsyms" am: 53f91652de am: a38b2ff9fd
am: aa90a389dc

Change-Id: I2332e7783286d1b0177eb275ecb742308155f8ee