Merge "keymaster: use size_t instead of int"