[automerger skipped] Merge "HwBlob: s/malloc/calloc/" into oc-dev am: 123ffb6202 am: f489aed3c1 am: 96f4f9e2e9
am: b8ff385796 -s ours
am skip reason: change_id I48f4d7cb20c4bfe747dd323ae3744d323ad097c9 with SHA1 05c973aeb6 is in history

Change-Id: I489b4dc1cfc80e35b126fa1e2c811dc1b6228772