Merge "Use std::string to return crypto device, not char *" am: 80731b0975

Change-Id: I4cdc6e59713a945f9fc7b6e9d8c765e78c44b9cb