Merge "File context for vendor_boot in Lahaina - Use existing...

Merge "File context for vendor_boot in Lahaina    - Use existing boot_block_device label for vendor_boot_[a/b]       vendor_custom_ab_block_device cpucp_[a/b]  & shrm_[a/b]         "