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

Change-Id: Id9e2d2bf12a3d68a8561e66e9e3571b67d950e76