Merge "Revert "Set vendor: true for boot control HAL"" am: 04ba91ef05
am: 1d08857133

Change-Id: I89682587dea0c709c2700a5f67ae196c4727c7d4