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

Change-Id: I0eb74c0a12a39875b4e4d417b844f1bc287f87d0