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