Fixes for b/4149416:expired license refresh, b/4126624:heartbeats, b/4171055: inconsistent license modes

Also includes b/3500025: A/V resync issues

Change-Id: Ib885d7219d211b188f38e9427bdaecd10fbd7329

proprietary/wvm/include/WVMExtractorImpl.h

@@ -20,6 +20,7 @@
 
 #include "AndroidConfig.h"
 #include "WVStreamControlAPI.h"
+#include "WVMInfoListener.h"
 #include <media/stagefright/MediaExtractor.h>
 #include <media/stagefright/DataSource.h>
 #include <utils/RefBase.h>
@@ -57,6 +58,7 @@ private:
     sp<MetaData> mFileMetaData;
     sp<WVMFileSource> mFileSource;
     sp<DataSource> mDataSource;
+    sp<WVMInfoListener> mInfoListener;
 
     bool mHaveMetaData;