[ Merge of http://go/wvgerrit/16364 ] http://go/wvgerrit/16249 changed the name of the encryption pattern structure from OEMCrypto_PatternDesc to OEMCrypto_CENCEncryptPatternDesc to remove ambiguity. These are matching changes to CDM core. [ Merge of http://go/wvgerrit/16340 ] This CL passes the cipher mode in the license to OEMCrypto when keys are loaded and specifies the pattern encryption scheme to OEMCrypto_DecryptCENC. b/20630275 Change-Id: I86b82bbdc891fd0100beb9fad385ca2082176271