Merge "Leak in ToneGenerator_native_setup"