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

Change-Id: Idcebaae70a3a0202f3e67af0e53af666e44b65c0