Merge "aaudio: fix race condition in timestamp path"
am: e816ba20c5

Change-Id: I1dc5cbf8a149e5b233948f53f2d5014ff5c5afa9