Fix up some merges where we wanted the upstream version.
re #13879 make libsqlite a real shared lib (tweaks)
  Fix rebuild after pull (remove files left in the way)
  Make sqlite.h SQLITE_VERSION more predictable.
OS-5 Integrate virtio drivers
    integration cleanup (copyrights, cddl 1.0)
port of illumos-1147
    1147 integrate the virtio-block driver
    Reviewed by: Dmitry Yusupov <Dmitry.Yusupov@nexenta.com>
    Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
    Approved by: Garrett D'Amore <garrett@damore.org>

@@ -32,11 +32,11 @@
 set name=pkg.fmri value=pkg:/driver/storage/vioblk@$(PKGVERS)
 set name=pkg.description value="Virtio block driver"
 set name=pkg.summary value="Virtio block"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Hardware
-set name=variant.arch value=i386
+set name=variant.arch value=$(ARCH)
 dir path=kernel group=sys
 dir path=kernel/drv group=sys
 dir path=kernel/drv/$(ARCH64) group=sys
 driver name=vioblk alias=pci1af4,1001 clone_perms="vioblk 0666 root sys" \
     perms="* 0666 root sys"