Merge "Move libboot_control to boot_control 1.1" am: f89784a55f

Change-Id: I34471b38172fb790a62513fe662589dbf82160c1