[automerger skipped] Merge changes from topic "apex_libc_malloc" am: c345d87aab am: 7e50abf7ee -s ours
am: 4637e79aaa -s ours
am skip reason: change_id I4c41de361fdb3fa34b95218923f4ce4e9c010f9e with SHA1 ff94a13d2d is in history

Change-Id: I6817bbf36ba8777b4b9de4e45965356f72038b5e