Merge "Fix short sound playback" into lmp-mr1-dev

            mAudioQueue.erase(mAudioQueue.begin());

            entry = NULL;

            // 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;

        }