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

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

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