DO NOT MERGE SimpleDecodingSource: fix handling of Vorbis buffers am: 2817be0fad
am: b03b155f66  -s ours

Change-Id: I8049b3572ac372e9bcb1fc419f7af2005b66291d