Merge "Simplify some code in NuPlayerRenderer"

        mDrainAudioQueuePending = false;

        if (offloadingAudio()) {

            mAudioSink->pause();

            mAudioSink->flush();

            if (!mPaused) {

                mAudioSink->start();

            }

        } else {

        mAudioSink->pause();

        mAudioSink->flush();

        if (!offloadingAudio()) {

            // Call stop() to signal to the AudioSink to completely fill the

            // internal buffer before resuming playback.

            // FIXME: this is ignored after flush().

            mAudioSink->stop();

            mNumFramesWritten = 0;

        }

        if (!mPaused) {

            mAudioSink->start();

        }

            mNumFramesWritten = 0;

        }

        mNextAudioClockUpdateTimeUs = -1;

    } else {

        flushQueue(&mVideoQueue);