[automerger skipped] [automerger] sonivox: fix hang caused by bad meta-event am: ba9ea23466 am: 3983856ec1 am: 59644944e2 am: f3c51f7f1e am: d2901553df am: b0081b7c58 am: 88510ce7be am: ef8ae5940d am: 52fae8ba07 am: c315f9d3f6 am: 096edd76c8 am: 35388b2b37  -s ours
am: b481f56ff0  -s ours

Change-Id: I6d95cb47130f1a879a90687e833ae3c1dbd6f4a2