Merge pull request #2474 from billhollings/VK_KHR_maintenance4 Fix failure when shader specifies both LocalSizeId and workgroup size builtin.