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

Change-Id: I82019514912368097ac1d9445f22d05d0b6dbb1b