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

Change-Id: I72ca7bfbb753d03331425342039d3006e25c74c7