Merge "Make AmrInputStream use MediaCodec"