Merge "Fix memory leak in keymaster unit tests."