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

Change-Id: I7ab4502f3672ce2f9e1a5113756c80c6f4e3725f