Merge "bootctrl: Fix vendor space usage to not conflict with theme data."