Merge "Improve error reporting in MediaCodec"