Source release v2.1.5-0-811 + third_party libs

Change-Id: Ic8eafba071e486e671257bc22a8208e86d68b08a

README.upgrading

@@ -1,5 +1,5 @@
 README.upgrading for Widevine CDM Partner Kit v2.1
-Date: 7/02/2014
+Date: 7/07/2014
 
 This document provides details on important changes between versions of the
 Widevine CDM.  Some upgrades may require you to make changes to your
@@ -9,13 +9,13 @@ NOTE: All gyp variables have default values in platforms/global_config.gypi.
 You may override these defaults in your platform-specific gypi.
 
 
-New in v2.1.4:
+New in v2.1.5:
 =====
 New gyp variables have been introduced to make the build more configurable:
-  * protobuf_gyp
-    For gyp-based projects with their own internal version of protobuf, allows
-    the path to the protobuf gyp file to be overridden.  The default is
-    third_party/protobuf.gyp.  Ignored if use_system_protobuf is 'true'.
+  * protobuf_lib_type and protobuf_lib
+    These, along with 'protoc_dir', form a new protobuf configuration model
+    and replace the variables 'protobuf_source_dir', 'use_system_protobuf',
+    and 'protobuf_gyp'.  For details, see platforms/global_config.gypi.
 
 
 New in v2.1.3:
@@ -103,12 +103,3 @@ updated in oemcrypto/include.  The following functions were added:
 
 The file ./platforms/x86-64/x86-64.gypi now contains examples of how settings
 can be customized for a given platform.
-
-New gyp variables have been introduced to make the build more configurable:
-  * use_system_protobuf
-    Allows building protobuf from source, rather than using a system-wide
-    installation of the library and its tools.  Defaults to 'true'.
-  * protobuf_source_dir
-    The path to the protobuf sources.  Ignored if use_system_protobuf is
-    'true'.  The source dir is expected to have a valid config.h for the
-    platform.