Merge "fix [2483384] logcat crash when malloc debug is enabled"