Merge from master branch of Widevine repo of http://go/wvgerrit/66064 Merge from oemcrypto-v15 branch of Widevine repo of http://go/wvgerrit/63063 This is in the reference code for OEMCrypto, and in the unit tetss. Bug: 111939411 Test: unit tests Test: tested as part of http://go/ag/5501993 Change-Id: I2cc2e7028f62d1c375eb632452eef94566fa9ae3