[ Merge of TBD ] The merge of oemcrypto-v18 cdm branch to udc-widevine-dev caused a number of CDM/plugin fixes to be lost. This undoes the non-oemcrypto changes in http://go/ag/26105061 Bug: 290252845 Test: WVTS, unittests on panther Change-Id: I2bb99f423bda351eee30276cb0e26e3d9e27fa7d