Merge "Fix struct vs. class mismatch in forward definitions"

struct AReplyToken;

struct AString;

struct CodecBase;

struct IBatteryStats;

class IBatteryStats;

struct ICrypto;

class MediaCodecBuffer;

class IMemory;

class IResourceManagerService;

struct PersistentSurface;

struct SoftwareRenderer;

struct Surface;

class Surface;

struct MediaCodec : public AHandler {

    enum ConfigureFlags {