Merges diffs between gfxstream-protocols and vulkan-cereal am: cc5fddf258

Original change: https://android-review.googlesource.com/c/platform/external/gfxstream-protocols/+/2109434

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