[vulkan] Take codegen fixes am: 1dafbc3d18
am: b855b70631

Change-Id: I848453b88dcc5295078f5597876ec16544e23709