Source release v2.2.0-0-903 + third_party libs

Change-Id: I03f670eaeb052bc741abb347be06f8ddc58418e7

cdm/cdm.gyp

@@ -35,6 +35,7 @@
         '../third_party/stringencoders/src',
       ],
       'sources': [
+        '../cdm/src/host_4_file_io_client.cpp',
         '../cdm/src/file_store.cpp',
         '../cdm/src/properties_common.cpp',
         '../core/src/string_conversions.cpp',
@@ -67,9 +68,11 @@
       ],
       'sources': [
         # uses common published api
+        '../cdm/src/cdm_library_init.cpp',
         '../cdm/src/clock.cpp',
         '../cdm/src/host_event_listener.cpp',
-        '../cdm/src/wv_content_decryption_module.cpp',
+        '../cdm/src/wv_content_decryption_module_1.cpp',
+        '../cdm/src/wv_content_decryption_module_4.cpp',
         '../core/src/buffer_reader.cpp',
         '../core/src/cdm_engine.cpp',
         '../core/src/cdm_session.cpp',
@@ -80,18 +83,10 @@
         '../core/src/license.cpp',
         '../core/src/oemcrypto_adapter_static.cpp',
         '../core/src/policy_engine.cpp',
-        '../core/src/privacy_crypto.cpp',
+        '../core/src/privacy_crypto_<(privacy_crypto_impl).cpp',
         '../core/src/properties.cpp',
       ],
       'conditions': [
-        ['disable_privacy_crypto=="true"', {
-          'sources!': [  # exclude
-            '../core/src/privacy_crypto.cpp',
-          ],
-          'sources': [  # include
-            '../core/src/privacy_crypto_dummy.cpp',
-          ],
-        }],
         ['oemcrypto_v8=="true"', {
           'sources!': [  # exclude
             '../core/src/oemcrypto_adapter_static.cpp',