Merge "Make bootctrl.default use LOCAL_HEADER_LIBS bootimg_headers."