Merge "Benchmark : Add flac vectors for DecoderTest and EncoderTest" am: 90157191c2 am: 2f2030e041
am: a208f2f5b7

Change-Id: I30eecdc9abfa26db36a0c6f539fa5beae1285d6f