am c36f41fd: Merge "Support gdb wrappers"

* commit 'c36f41fd38c0dfc09ef486e6c3b2eda26c3a5b24':
  Support gdb wrappers