Merge "Set vendor: true for boot control HAL" am: b2fa66c4c9
am: cb77f406b1

Change-Id: I52889b1fcba191afab28a5c7a4c107f9e60d9840