[automerger skipped] Merge "SoftVorbis: handle flush as well as flush with CSD" am: 73173d7ba3 am: d455c5fc94
am: 8b5388b27e  -s ours

Change-Id: I5a781ed9ebfa3171644ae7abf6d0d76ca6a7545e