Merge "Defend against a system server crash." into jb-mr2-dev

                        && info.userid == userid) {

                    mListeners.remove(i);

                    if (info.connection != null) {

                        try {

                            mContext.unbindService(info.connection);

                        } catch (IllegalArgumentException ex) {

                            // something happened to the service: we think we have a connection

                            // but it's bogus.

                            Slog.e(TAG, "Listener " + name + " could not be unbound: " + ex);

                        }

                    }

                }

            }