Merge "Fix mismatched-tags error"

struct ABuffer;

struct ALooper;

struct AudioTrack;

class AudioTrack;

class IGraphicBufferProducer;

struct MediaCodec;

class MediaCodecBuffer;

namespace android {

struct IHDCP;

struct IMediaCodecList;

class IMediaCodecList;

struct IMediaHTTPService;

class IMediaRecorder;

class IOMX;

        DISALLOW_EVIL_CONSTRUCTORS(Capabilities);

        friend class MediaCodecInfo;

        friend struct MediaCodecInfo;

    };

    // Use a subclass to allow setting fields on construction without allowing

    DISALLOW_EVIL_CONSTRUCTORS(MediaCodecInfo);

    friend class MediaCodecList;

    friend struct MediaCodecList;

    friend class MediaCodecListOverridesTest;

};

struct ABuffer;

class ACodecBufferChannel;

class MediaCodecBuffer;

struct MemoryDealer;

class MemoryDealer;

struct DescribeColorFormat2Params;

struct DataConverter;

    sp<GraphicBuffer> mGraphicBuffer;

    sp<Fence> mFence;

    friend class FrameRenderTracker;

    friend struct FrameRenderTracker;

};

struct FrameRenderTracker {