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

Change-Id: I4894ca20c2ad52565490beb92a1a40efdb05496e