resolve merge conflicts of 641f2cf4 to master

Test: [sailfish] make ; mmm frameworks/native/vulkan
Change-Id: I8555fdfbe6375e6266d07b66b5a8085d37e1ffde

vulkan/api/platform.api

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,4 +49,5 @@ type u64 size_t
		@internal type void* HINSTANCE
		@internal type void* HWND
		@internal type void* HANDLE
		@internal type u32 DWORD
		@internal class SECURITY_ATTRIBUTES {}