Merge "Label /vendor/bin/hw on devices without vendor partition"