Merge "Move to android_mallopt for malloc debug calls."
am: 28d257e48b

Change-Id: Icc98a33261d476e83bd18b633e60328a6ca0c355