[automerger skipped] Merge "OpusHeader: Fix integer overflow in GetOpusHeaderBuffers" into qt-qpr1-dev am: 40e79433 -s ours am: 6437df87 -s ours am: 1a83daf6 -s ours am: 02d33a93 -s ours am: 00e449d0 -s ours

am skip reason: Change-Id Iff742d2fdf4139bab7b5f378c1742ef52c0bbc78 with SHA-1 6b3b2f26 is in history

Change-Id: I0fd6e0c411223962c09b5128f5330cd7648016ac