am ba97ad2a: Merge "Leak in ToneGenerator_native_setup"

* commit 'ba97ad2a6740d5d38326c0c2ce8d5a685fab30bf':
  Leak in ToneGenerator_native_setup