Merge "Fix build break for camera.v4l2_test" into main am: da7cdc6943

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/3254292

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