Merge "Vulkan: correctly expose Vulkan entry points"
am: 8aeaf3c321

Change-Id: Iac2d561c21c73476b68bffba8e9103fa7151abcb