Merge "aaudio: change samplesPerFrame() to channelCount()" into oc-dev am: 89b67d6054
am: 93368f9602

Change-Id: I7ebd1c3a347715dc4aaef8a2a382c9171d0cc08b