Merge "Make libboot_control vendor available." am: e3a35dc808 am: 388d2a591c
am: bda485070c

Change-Id: I84a07437b4976ac1c63421257355debb36ef067f