Merge "gatekeeperd: use std::unique_ptr"