Merge "gatekeeperd: use std::unique_ptr" into oc-mr1-dev
am: 202fedd1fe

Change-Id: I72aa2745bcd5a14785fa77845f07d15ce648c933