Merge "Revert "Set vendor: true for boot control HAL""