Merge branch 'jekstrand_spirv_assembly_fixes' into 'master'

Various fixes for the spirv_assembly tests

This fixes all of the problems I've found so far with the SPIR-V assembly tests.

I think this should be enough to fix #184.

See merge request !301