Merge "Update vulkan headers location after aosp/2597360"