Merge from Widevine repo of http://go/wvgerrit/26880 and http://go/wvgerrit/26062 Deliver oem_certificate_generator b/37996004 Testing: Tool delivery only Change-Id: Id95bd3cdd7cf5b48d225624747ab1f8499e4f438