Merge oemcrypto-v17 to master

[ Merge of http://go/wvgerrit/144530 ]

It's time to copy all the v17 work to our main branch.
I had to re-run clang-format to match local style.

Merge from commit b14f08374f9a48aed49850cc230daf384725b15f
Fix allow_null for key control iv in L3 v17

Bug: 161477208
Test: GtsMediaTestCases on sunfish
Change-Id: I97caa851e9e65eb0e42034d2f4a28dfb7499df0d

libwvdrmengine/oemcrypto/odk/include/odk_message.h

@@ -35,10 +35,10 @@ extern "C" {
  */
 
 #if defined(__GNUC__) || defined(__clang__)
-#define ALIGNED __attribute__((aligned))
+#  define ALIGNED __attribute__((aligned))
 #else
-#define ALIGNED
-#error ODK_Message must be aligned to the maximum useful alignment of the \
+#  define ALIGNED
+#  error ODK_Message must be aligned to the maximum useful alignment of the \
   machine you are compiling for. Define the ALIGNED macro accordingly.
 #endif