am 2326be4f: am ba97ad2a: Merge "Leak in ToneGenerator_native_setup"

* commit '2326be4fa9cb3b523a3ea13875e91bdc437da33d':
  Leak in ToneGenerator_native_setup