Merge "Vulkan: correctly expose Vulkan entry points" am: 8aeaf3c321 am: 2de7b6dd19
am: cb2a5c1856

Change-Id: I8bab8e72ce442e74c143f68adfb1aa5f1ef762bc