Update OEMCrypto test comments and logs

Merge from Widevine repo of http://go/wvgerrit/121886

This CL merges some changes from branch rvc-dev to sc-dev
that prepared it for merge.

One change is that the unit tests now say they are part of
Android S instead of R.

Bug: 180546871
Change-Id: I2ebbd8f7b8586389ebb75f3743a2dc2ad8caa214

libwvdrmengine/oemcrypto/test/oec_session_util.h

@@ -669,9 +669,8 @@ void WriteRequestApiCorpus(size_t signature_length, size_t core_message_length,
                            vector<uint8_t>& data);
 template <PrepAndSignRequest_t PrepAndSignRequest>
 void GetDefaultRequestSignatureAndCoreMessageLengths(
-    uint32_t& session_id, size_t& required_message_size,
-    const size_t& small_size, size_t* gen_signature_length,
-    size_t* core_message_length);
+    uint32_t& session_id, const size_t& small_size,
+    size_t* gen_signature_length, size_t* core_message_length);
 }  // namespace wvoec
 
 #endif  // CDM_OEC_SESSION_UTIL_H_