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

Change-Id: I75981256fe8a29ff53e6018064d705ec6d1be71e