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

Change-Id: I68cf7bfc6ce642d46d874bb44694109b1f43258e