[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am: aba4de21e0
am: df4acb4d8c -s ours
am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1 4740d54243 is in history

Change-Id: Idaf690cb8b3050a0109a50f036024341a03dd3cc