More multiarch fixes for devel/libvolume_id
Merge branch 'joyent/feature/multiarch/trunk' into joyent/bulktest/oneshot