Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56
am: 73c41f9d70

Change-Id: I12556bc1f16c13abfe7018a9c21258c73e46c7a0