Merge "Handle VkSamplerCustomBorderColorCreateInfoEXT in on_vkCreateSampler()" am: e365128420 am: 5cd3f0184f am: d6c6afb433

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2052061

Change-Id: I515a83d0704a76d71012285048713daee102e5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>