[automerger skipped] Merge "OpusHeader: Fix integer overflow in...

[automerger skipped] Merge "OpusHeader: Fix integer overflow in GetOpusHeaderBuffers" into qt-qpr1-dev am: 40e79433 -s ours am: 6437df87 -s ours am: ea7f0dab -s ours am: 05ea745b -s ours am: b619484a -s ours am: 8f2f4c70 -s ours

am skip reason: Change-Id Iff742d2fdf4139bab7b5f378c1742ef52c0bbc78 with SHA-1 3473d558 is in history

Change-Id: I92a3677340cf485b9e84bc61a749ac7519bc49b6