Merge "[vulkan] properly encode descriptor update template API (guest)" am: 103d897342 am: 4af037905c
am: 859008615c

Change-Id: Ief80f8382c7fd871f4c2787f1c0040aff699bf20