Merge "Fix android.media.cts.ImageReaderDecoderTest fail on MT6580 project"
am: 13916e1d17

Change-Id: Id5ccf7fbd9de909caae40a96af30e13828fe489a