Merge "aaudio: restore _get and _setSamplesPerFrame()" into oc-mr1-dev