Merge from master branch of Widevine repo of http://go/wvgerrit/66076 Merge from oemcrypto-v15 branch of Widevine repo of http://go/wvgerrit/64743 http://go/wvgerrit/64083 had some refactorings that weren't completely accurate or slightly changed the meaning of some tests. This CL is an addendum to that CL to fix those refactorings. Test: tested as part of http://go/ag/5501993 Bug: 115874964 Change-Id: I37766a4c34de737eb9ca94ef781805435ee30dfd