resolve merge conflicts of a80bdc38 to nyc-mr1-dev-plus-aosp

// ----------------------------------------------------------------------------

static void android_media_visualizer_native_release(JNIEnv *env,  jobject thiz) {

    // ensure that lpVisualizer is deleted before lpJniStorage

    {

    { //limit scope so that lpVisualizer is deleted before JNI storage data.

        sp<Visualizer> lpVisualizer = setVisualizer(env, thiz, 0);

        if (lpVisualizer == 0) {

            return;

        }

    }

    // delete the JNI data

    VisualizerJniStorage* lpJniStorage =

        (VisualizerJniStorage *)env->GetLongField(thiz, fields.fidJniData);