Merge "aaudio: change samplesPerFrame() to channelCount()" into oc-dev