Merge "Fix struct vs. class mismatch in forward definitions"
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h
index 98780ce..e3e5c2d 100644
--- a/include/media/stagefright/MediaCodec.h
+++ b/include/media/stagefright/MediaCodec.h
@@ -33,7 +33,7 @@
struct AReplyToken;
struct AString;
struct CodecBase;
-struct IBatteryStats;
+class IBatteryStats;
struct ICrypto;
class MediaCodecBuffer;
class IMemory;
@@ -42,7 +42,7 @@
class IResourceManagerService;
struct PersistentSurface;
struct SoftwareRenderer;
-struct Surface;
+class Surface;
struct MediaCodec : public AHandler {
enum ConfigureFlags {