Merge "Fix benign overflow in AudioTrack"