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

Change-Id: I56dbbc43f551878ab6bbd5690a8780c18dc9038c