Merge "audioflinger: align track dump header and content." into main