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

Change-Id: I0ce17d4f3775c72eaf733b8245a3cb7a83749726