* Detect variant via vendor sku prop * Revert recent libinit changes Change-Id: I31c13f33368410f35ad3c7eca04f6c60306e1f8f