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

Change-Id: Ic7683749f4974ccdf251b7351110a1e3663536b7