Merge "bootable: leak less memory" am: 19073f2067

am: 37395747a8

Change-Id: If49a5e1a2d997346cc1c1fc5a8652eb033a5f1a7

boot_control/libboot_control.cpp

@@ -218,7 +218,8 @@ bool BootControl::Init() {
   }
 
   // Note that since there isn't a module unload function this memory is leaked.
-  misc_device_ = strdup(device.c_str());
+  // We use `device` below sometimes, so it's not moved out of here.
+  misc_device_ = device;
   initialized_ = true;
 
   // Validate the loaded data, otherwise we will destroy it and re-initialize it