Merge "Fix sizeof warnings on unusual calloc" am: 4ca44e7615 am: 3f31ee2d2a am: caeb590d0a

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

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