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

Change-Id: I72c6dd7f474010b5410209efad69b0c3fbc88f85