Merge "Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video.""