Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)

#rb none

[CL 4577636 by Ben Marsh in Dev-Build branch]

Engine/Source/Developer/AudioFormatOgg/Private/AudioFormatOgg.cpp

@@ -451,8 +451,11 @@ public:
 
 		// Use a base chunk size of MONO_PCM_BUFFER_SIZE * 2 because Android uses MONO_PCM_BUFFER_SIZE to submit buffers to the os, the streaming system has more scheduling flexability when the chunk size is
 		//	larger the the buffer size submitted to the OS
+#if PLATFORM_ANDROID
 		uint32	ChunkSize = MONO_PCM_BUFFER_SIZE * 2 * QualityInfo.NumChannels;
-		
+#else
+		uint32 ChunkSize = MaxChunkSize;
+#endif
 		while(SrcSize > 0)
 		{
 			int32	CurChunkDataSize = FMath::Min<uint32>(SrcSize, ChunkSize);