Merge "DrmListener: Don't leak memory in error case."

            break;

        default:

            ALOGE("Invalid event DrmPlugin::EventType %d, ignored", (int)eventType);

            return;

            goto cleanup;

    }

    (*mListener)(mObj, &sessionId, ndkEventType, extra, data, dataSize);

 cleanup:

    delete [] sessionId.ptr;

    delete [] data;

}