[automerger skipped] Merge "Cherry-pick "begin cleanup of malloc porting layer"" into oc-dev am: 1feb147ef9  -s ours am: f4b8da5a9f  -s ours am: 96b6562c2c  -s ours am: 9184eaf817  -s ours
am: c5b60339c6  -s ours

Change-Id: I2cf096470743d5277fdcddd3f9fe04a98fb84862