Merge "Revert "Update AudioTrack comments""