[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am: 28d257e48b
am: 3f0b1d7218 -s ours
am skip reason: change_id I75adddfc5048f732ee7ec27c17192efd5857af38 with SHA1 a90adf0a05 is in history

Change-Id: I830a72a875f45dcc31642bab952eea0dfd96e087