Merge "Add trampoline symbols to native debug info."
am: b2359d4fb2

* commit 'b2359d4fb2c9de12830301faede59f4d5fa46278':
  Add trampoline symbols to native debug info.