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

Change-Id: Ia70a4b63248d803c2154044f670539e4023ec3ae