Merge "fix AudioTrack and AudioRecord JNI"