Merge "libvulkan: Fix count returned for incomplete wsi queries" am: 75bb94fe7e
am: f4171ecd58

Change-Id: I549bdd589575e505063de0ed4aa7fda97c481e32