Merge from Widevine repo of http://go/wvgerrit/56524 Test: unit tests, including generic crypto tests, pass. Bug: 72354901 Fix Generic Crypto tests. Change-Id: I39404424acb2d896afe06c461a02e3664c0f45de