Merge "Stop using varargs in libkeyutils."