Merge "AAudio: Fix setChannelCount and setSamplesPerFrame"