am 4f499fba: am c36f41fd: Merge "Support gdb wrappers"

* commit '4f499fba73dd7bc04248f310df9b8b90f93d5de8':
  Support gdb wrappers