Merge "audio: fix AudioTrack and AudioRecord restore"