Merge "Fix android.media.cts.ImageReaderDecoderTest fail on MT6580 project"