Merge "Replacement for gdbclient"