Merge ssh://gerrit.chromium.org:29418/chromiumos/third_party/opencryptoki