Merge "Move libboot_control to boot_control 1.1"