Merge 97-spirv-assembly-tests
authorPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 23:37:17 +0000 (15:37 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 23:37:17 +0000 (15:37 -0800)

Trivial merge