Merge from master branch of Widevine repo of http://go/wvgerrit/66068
Merge from oemcrypto-v15 branch of Widevine repo of http://go/wvgerrit/62066
Bug: 111939411
Test: docs only
Test: tested as part of http://go/ag/5501993
Change-Id: Ic682b603cd6d90b10df433b76c071c303b4e35cc