Merge "Move libboot_control to boot_control 1.1" am: feb6b91ed4 am: d7df83c4bd am: 430b513cc1 am: 02e3451b75

Change-Id: I66e3581b2487e7c6d12b32ab14c80681c147fb91