Merge "NuPlayer: Fix failure to stop audio playback" into lmp-mr1-dev

            mAudioQueue.erase(mAudioQueue.begin());

            entry = NULL;

            // Need to stop the track here, because that will play out the last

            if (mAudioSink->needsTrailingPadding()) {

                // If we're not in gapless playback (i.e. through setNextPlayer), we

                // need to stop the track here, because that will play out the last

                // little bit at the end of the file. Otherwise short files won't play.

                mAudioSink->stop();

                mNumFramesWritten = 0;

            }

            return false;

        }