Merge "Merge "Move libboot_control to boot_control 1.1" into rvc-dev am: 2774d5f4f0 am: c8f84dd3ec am: 178d88350c" into rvc-qpr-dev-plus-aosp