Merge "DO NOT MERGE SimpleDecodingSource: fix handling of Vorbis buffers" into nyc-mr2-dev am: 984ef5ce8e
am: 204e8dc55c  -s ours

Change-Id: I0e9b613920aa25343961b46d65cc15cd0b6f0110