Merge "Update path to gdbserver to match misc change."