Merge "Add 'vendor.' prefix to a vendor HAL service name"