Merge "[vulkan] fix -Wreorder-init-list"
am: f6dd948369

Change-Id: Ia29fcd2ef2c4453bb74e796cd339a19108512686