Merge "Revert "Add support for vendor_boot"" into rvc-dev