Merge "Have the framework setup android defines for including vulkan.h"