Merge "Revert "Move `stride` into `cb_handle_t` from `cb_handle_30_t`"" am: 14645a76db

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

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