Merge "Drop non-API headers from the NDK vulkan headers."