resolved conflicts for merge of 98c35aa4 to master

Change-Id: I32de004b575729f9b1852517ad5df71395e0ae69

proprietary/wvm/include/WVMMediaSource.h

@@ -13,6 +13,7 @@
 #include <media/stagefright/MetaData.h>
 #include <media/stagefright/MediaBufferGroup.h>
 #include <utils/RefBase.h>
+#include "ClientContext.h"
 #ifdef REQUIRE_SECURE_BUFFERS
 #include "OEMCrypto_L1.h"
 #endif
@@ -29,6 +30,7 @@ public:
 
     void delegateFileSource(sp<WVMFileSource> fileSource);
     void delegateDataSource(sp<DataSource> dataSource);
+    void delegateClientContext(sp<ClientContext> context);
 
     virtual status_t start(MetaData *params = NULL);
     virtual status_t stop();
@@ -88,6 +90,7 @@ private:
 
     sp<WVMFileSource> mFileSource;
     sp<DataSource> mDataSource;
+    sp<ClientContext> mClientContext;
 
     Vector<size_t> mEncryptedSizes;