Merge "aaudio: fix race condition in timestamp path"