[automerger skipped] Merge "Vulkan: correctly expose Vulkan entry points" am: 8aeaf3c321 am: 2de7b6dd19 am: cb2a5c1856
am: 4e9348bd64 -s ours
am skip reason: change_id I0a3e06dc04bade4f36a7e68ee2f53979c656ee4e with SHA1 7cc36a50e1 is in history

Change-Id: Ibdd2cb0d830e50d59df9c93e9160b9dc4d6dbb9e