Merge "SoftVorbis: handle flush as well as flush with CSD" am: 73173d7ba3
am: d455c5fc94

Change-Id: Id012cdbe5c05ed0959fdec00090eb91fa8edf138