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

Change-Id: I34b82b2abe1836d1595a927b1721f36992d9520c