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

Change-Id: I161dcaff5823fbb33f648e2af833754f6246787a