Merge "Refactor VK_ANDROID_native_buffer header"