Merge "Rename soft_keymaster_device to libsoftkeymaster"