[automerger skipped] Merge "OpusHeader: Fix integer overflow in GetOpusHeaderBuffers" into qt-qpr1-dev am: 40e79433 -s ours am: 6437df87 -s ours
am skip reason: Change-Id Iff742d2fdf4139bab7b5f378c1742ef52c0bbc78 with SHA-1 3473d558 is in history
Change-Id: I50fec5d53fd3b581a61751189ae58a51338599d4