[automerger skipped] DO NOT MERGE: sonivox: fix hang caused by bad meta-event (cts) am: 2e62fd9c01  -s ours
am: 9971745d8d  -s ours

Change-Id: I9b652bac52d164aef55fee061b8814ec2da314d4