Merge "Add unique audio port IDs to AudioTrack and AudioRecord"