Merge "Fix "adb sync" for devices without vendor and oem."