Merge from Widevine repo of http://go/wvgerrit/24863 The oemcrypto unit tests GenericKeyDecryptSameBuffer and GenericKeyDecryptSameBuffer require features in oemcrypto v12, so they should not be run on devices that report oemcrypto v11 or earlier. b/36071236 Test: Unit tests run on Ryu and Bullhead. Change-Id: Ia6645559ed98cae8d9807a14d6f0e514c5c4c615