Merge "extractors: allow OEM to control output type for WAV/FLAC" into android10-dev