Merge from Widevine repo of http://go/wvgerrit/122403 Re-merge of http://go/wvgerrit/105184 which was accidentally undone by http://go/wvgerrit/107063. Unused params are reported as warning when built in Android. Test: Ran oemcrypto unit tests Bug: 160734070 Change-Id: Id8384c58c8ace0b214464380fb961d108f1b5c3b