Merge "AudioTrackShared: Fix audio_track_cblk_t layout for 64-bit" into nyc-dev