Merge "aaudio: fix intermittent hang and position error" into oc-dr1-dev
am: c1fe2634dc

Change-Id: I44d29f0bc88935ccba6b365fec242568d35f6079