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

Change-Id: Ia896ea5e1a546688e7ecc029986aa4bba3d9f69c