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

Change-Id: I9ee92e1609ea285c1ae63f7b427fd62c24aa6127