Merge from Widevine repo of http://go/wvgerrit/95087 The ODK library is used in OEMCrypto, and in test code, but it is not needed in the CDM layer. As such, it can be removed from the Android.mk for cdm libraries. Bug: 150809634 Test: unit tests Change-Id: If29458e7d3d940f9a383d77e5082e7388e19c32f