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

Change-Id: Ie6b3a2e5ac3d4c6edc3cbb7ae6154e9515a4510e