Merge "Revert "NuPlayer: Use ".m3u8" in substring search to determine HLS URL""