Merge "Fix sizeof warnings on calloc" am: bb3bbc1b12

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2337103

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