Merge "AudioTrack JNI cleanup"