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

Change-Id: I11d68de26dbcc95869609440f0ca491493805d71