Merge "Move to android_mallopt for malloc debug calls."