[ Merge of http://go/wvgerrit/144696 ] In v17, OEMCrypto_CipherMode_CTR renamed to OEMCrypto_CipherMode_CENC OEMCrypto_CipherMode_CBC renamed to OEMCrypto_CipherMode_CBCS Bug: 224375138 Test: GtsMediaTestCases on sunfish Change-Id: I2d96e9c6d22a9d9e2fbbd15a8aea3f2d5dac6dcb