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

Change-Id: I0b75901af97fc5ce77691005b297ef9f924961c4