Merge "Clean up AudioTrack position and timestamp handling" into lmp-dev