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

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

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