Merge changes from topic "apex_libc_malloc"
am: c345d87aab

Change-Id: I431000eea4b8c5424f58d7c753d186619a71e8b8