Update ODK library for OPK compatibility

This is a merge from http://go/wvgerrit of several changes to the ODK
library that allow it to be used in the same compilation unit as the
OPK serialization/deserialization code.

Merge of:
http://go/wvgerrit/104403
http://go/wvgerrit/105663
http://go/wvgerrit/106004
http://go/wvgerrit/107903
http://go/wvgerrit/107985
http://go/wvgerrit/110167
http://go/wvgerrit/110403
http://go/wvgerrit/110423
http://go/wvgerrit/110663
http://go/wvgerrit/110703
http://go/wvgerrit/110985
http://go/wvgerrit/111703
http://go/wvgerrit/112563
http://go/wvgerrit/113243
http://go/wvgerrit/115204
http://go/wvgerrit/117803
http://go/wvgerrit/121949

bug: 174518179
bug: 175920940
bug: 175126254
Change-Id: I433459182043ca43a040cdbc16d04f2b8215067a

libwvdrmengine/oemcrypto/odk/include/odk_structs.h

@@ -12,10 +12,14 @@
 
 /* The version of this library. */
 #define ODK_MAJOR_VERSION 16
-#define ODK_MINOR_VERSION 3
+// TODO(b/163416999): Do not change minor version to 16.5 on master branch.  The
+// version 16.5 is reserved for Alcatraz, iOS, and other L3 platforms using
+// third-party obfuscation tools. The version should not be used for CE CDM or
+// Android CDM. We should jump straight to 17.0.
+#define ODK_MINOR_VERSION 4
 
 /* ODK Version string. Date changed automatically on each release. */
-#define ODK_RELEASE_DATE "ODK v16.3 2020-08-18"
+#define ODK_RELEASE_DATE "ODK v16.4 2020-10-23"
 
 /* The lowest version number for an ODK message. */
 #define ODK_FIRST_VERSION 16