Merge "Keymaster: Move test to std::unique_ptr" am: 81348ffa9e
am: 346d7e1405

Change-Id: I14b39fd0f52501035c1d703bc006273c85736cb0