Merge "SoundPool: Clean up JNI weak reference handling" into tm-dev