Merge "Keymaster: Move test to std::unique_ptr" am: ce1ed06244
am: 70f96855a7

Change-Id: Iad94347cf83685d6bde8c7a7877df0e195783c69