[automerger skipped] Merge "Cherry-pick "begin cleanup of malloc porting layer"" into oc-dr1-dev am: da9711bcce  -s ours
am: e7f42ed091  -s ours

Change-Id: I7a2b45996f8e0cdd40bf78c1dae9d27911615f29