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

Change-Id: Ic7a647566a14af65e08a41d0752261ee460835d4