Merge "Merge "Test for vorbis decoder bug" into nougat-mr1-cts-dev am: 27cfd75389  -s ours"