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

Change-Id: Ifdb4d48ae3b432eae992000ede3fe889266e3ad8