Merge "aaudio: fix getXRunCount am: faeb8b20e8 am: 74aa2e0d85" into oc-mr1-dev-plus-aosp
am: 18683df374

Change-Id: I8ae20ee66100231ba1daca20f982120a18e7471d