Merge "Move libboot_control to boot_control 1.1" am: f89784a55f am: 3ab7c6f8b2

Change-Id: I5d276c20bc44307b0e79591c64e21a7b7e572252