Merge "Cherry-pick "begin cleanup of malloc porting layer"" into oc-dr1-dev